From 079abba2ceecef348169e1fea79f1a02c5156c0b Mon Sep 17 00:00:00 2001 From: Gauravjeet Singh Date: Fri, 2 Jun 2017 17:34:18 +0530 Subject: [PATCH] Prefix classes needed for JS functionality with js- --- modules/cart/commerce_cart.module | 2 +- modules/cart/css/commerce_cart.theme.css | 4 +-- modules/cart/js/commerce_cart.js | 2 +- .../checkout/css/commerce_checkout.admin.css | 36 +++++++++---------- .../checkout/js/commerce_checkout.admin.js | 2 +- .../CheckoutFlowWithPanesBase.php | 2 +- modules/payment/js/offsite-redirect.js | 2 +- .../src/PluginForm/PaymentOffsiteForm.php | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module index 802ea988f5..e6b2fd8c36 100644 --- a/modules/cart/commerce_cart.module +++ b/modules/cart/commerce_cart.module @@ -238,5 +238,5 @@ function commerce_cart_views_data_alter(array &$data) { * Prepares variables for the cart block element template. */ function template_preprocess_commerce_cart_block(&$variables) { - $variables['attributes']['class'][] = 'cart--cart-block'; + $variables['attributes']['class'][] = 'js-cart--cart-block'; } diff --git a/modules/cart/css/commerce_cart.theme.css b/modules/cart/css/commerce_cart.theme.css index a12c71773d..75bed0186d 100644 --- a/modules/cart/css/commerce_cart.theme.css +++ b/modules/cart/css/commerce_cart.theme.css @@ -13,7 +13,7 @@ .cart-block--contents__inner { padding: 10px; } -.cart--cart-block .cart-block--contents a { +.js-cart--cart-block .cart-block--contents a { color: inherit; } .cart-block--summary, @@ -22,7 +22,7 @@ vertical-align: middle; } -.cart--cart-block li.cart-block--contents__item { +.js-cart--cart-block li.cart-block--contents__item { clear: both; margin-bottom: 10px; border-bottom: 1px #eaeaea solid; diff --git a/modules/cart/js/commerce_cart.js b/modules/cart/js/commerce_cart.js index 1823841024..97aaa9b899 100644 --- a/modules/cart/js/commerce_cart.js +++ b/modules/cart/js/commerce_cart.js @@ -9,7 +9,7 @@ Drupal.behaviors.commerceCartBlock = { attach: function (context) { var $context = $(context); - var $cart = $context.find('.cart--cart-block'); + var $cart = $context.find('.js-cart--cart-block'); var $cartButton = $context.find('.cart-block--link__expand'); var $cartContents = $cart.find('.cart-block--contents'); diff --git a/modules/checkout/css/commerce_checkout.admin.css b/modules/checkout/css/commerce_checkout.admin.css index 673f06fd9a..d47abe95de 100644 --- a/modules/checkout/css/commerce_checkout.admin.css +++ b/modules/checkout/css/commerce_checkout.admin.css @@ -3,63 +3,63 @@ * Styles for the checkout flow add/edit form. */ -.checkout-pane-overview .region-title td { +.js-checkout-pane-overview .region-title td { font-weight: bold; } -.checkout-pane-overview .region-message td { +.js-checkout-pane-overview .region-message td { font-style: italic; } -.checkout-pane-overview .pane-configuration-summary-cell { +.js-checkout-pane-overview .pane-configuration-summary-cell { line-height: 1em; } -.checkout-pane-overview .pane-configuration-summary { +.js-checkout-pane-overview .pane-configuration-summary { float: left; /* LTR */ font-size: .9em; } -[dir="rtl"] .checkout-pane-overview .pane-configuration-summary { +[dir="rtl"] .js-checkout-pane-overview .pane-configuration-summary { float: right; } -.checkout-pane-overview .pane-configuration-summary-cell .warning { +.js-checkout-pane-overview .pane-configuration-summary-cell .warning { display: block; float: left; /* LTR */ margin-right: .5em; } -[dir="rtl"] .checkout-pane-overview .pane-configuration-summary-cell .warning { +[dir="rtl"] .js-checkout-pane-overview .pane-configuration-summary-cell .warning { float: right; } -.checkout-pane-overview .pane-configuration-edit-wrapper { +.js-checkout-pane-overview .pane-configuration-edit-wrapper { float: right; /* LTR */ } -[dir="rtl"] .checkout-pane-overview .pane-configuration-edit-wrapper { +[dir="rtl"] .js-checkout-pane-overview .pane-configuration-edit-wrapper { float: left; } -.checkout-pane-overview .pane-configuration-edit { +.js-checkout-pane-overview .pane-configuration-edit { float: right; /* LTR */ } -[dir="rtl"] .checkout-pane-overview .pane-configuration-edit { +[dir="rtl"] .js-checkout-pane-overview .pane-configuration-edit { float: left; } -.checkout-pane-overview .pane-configuration-editing td { +.js-checkout-pane-overview .pane-configuration-editing td { vertical-align: top; } -.checkout-pane-overview tr.pane-configuration-changed { +.js-checkout-pane-overview tr.pane-configuration-changed { background: #ffffbb; } -.checkout-pane-overview tr.drag { +.js-checkout-pane-overview tr.drag { background: #ffee77; } -.checkout-pane-overview tr.pane-configuration-editing { +.js-checkout-pane-overview tr.pane-configuration-editing { background: #d5e9f2; } -.checkout-pane-overview input.pane-configuration-edit { +.js-checkout-pane-overview input.pane-configuration-edit { margin: 0; padding: 1px 8px; } -.checkout-pane-overview .pane-configuration-edit-form .form-item { +.js-checkout-pane-overview .pane-configuration-edit-form .form-item { margin: 10px 0; } -.checkout-pane-overview .pane-configuration-edit-form .form-submit { +.js-checkout-pane-overview .pane-configuration-edit-form .form-submit { margin-bottom: 0; } diff --git a/modules/checkout/js/commerce_checkout.admin.js b/modules/checkout/js/commerce_checkout.admin.js index 0a11e73566..fa6a308540 100644 --- a/modules/checkout/js/commerce_checkout.admin.js +++ b/modules/checkout/js/commerce_checkout.admin.js @@ -19,7 +19,7 @@ */ Drupal.behaviors.checkoutPaneOverview = { attach: function (context, settings) { - $(context).find('table#checkout-pane-overview').once('checkout-pane-overview').each(function () { + $(context).find('table#checkout-pane-overview').once('js-checkout-pane-overview').each(function () { Drupal.checkoutPaneOverview.attach(this); }); } diff --git a/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php b/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php index 8b4728b25c..6aa504eae6 100644 --- a/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php +++ b/modules/checkout/src/Plugin/Commerce/CheckoutFlow/CheckoutFlowWithPanesBase.php @@ -237,7 +237,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ['data' => $this->t('Settings'), 'colspan' => 2], ], '#attributes' => [ - 'class' => ['checkout-pane-overview'], + 'class' => ['js-checkout-pane-overview'], // Used by the JS code when attaching behaviors. 'id' => 'checkout-pane-overview', ], diff --git a/modules/payment/js/offsite-redirect.js b/modules/payment/js/offsite-redirect.js index 2b9d15282e..a88c29de77 100644 --- a/modules/payment/js/offsite-redirect.js +++ b/modules/payment/js/offsite-redirect.js @@ -16,7 +16,7 @@ */ Drupal.behaviors.commercePaymentRedirect = { attach: function (context) { - $('.payment-redirect-form', context).submit(); + $('.js-payment-redirect-form', context).submit(); } }; diff --git a/modules/payment/src/PluginForm/PaymentOffsiteForm.php b/modules/payment/src/PluginForm/PaymentOffsiteForm.php index 4740dd4b94..6d904b4efa 100644 --- a/modules/payment/src/PluginForm/PaymentOffsiteForm.php +++ b/modules/payment/src/PluginForm/PaymentOffsiteForm.php @@ -106,7 +106,7 @@ protected function buildRedirectForm(array $form, FormStateInterface $form_state */ public static function processRedirectForm(array $element, FormStateInterface $form_state, array &$complete_form) { $complete_form['#action'] = $element['#action']; - $complete_form['#attributes']['class'][] = 'payment-redirect-form'; + $complete_form['#attributes']['class'][] = 'js-payment-redirect-form'; unset($element['#action']); return $element;