From 8653ba1fbe29acc37505b85adce1463d70e9cdf1 Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Fri, 6 Jul 2018 14:40:23 +0530 Subject: [PATCH 1/6] [Changed front js file locations] --- .../Magento/Authorizenet/view/frontend/requirejs-config.js | 2 +- app/code/Magento/Captcha/view/frontend/requirejs-config.js | 2 +- .../Magento/Captcha/view/frontend/web/{ => js}/captcha.js | 0 .../Magento/Captcha/view/frontend/web/{ => js}/onepage.js | 0 app/code/Magento/Customer/view/frontend/requirejs-config.js | 4 ++-- .../Magento/Customer/view/frontend/web/{ => js}/address.js | 0 .../view/frontend/web/{ => js}/change-email-password.js | 0 .../Magento/Downloadable/view/frontend/requirejs-config.js | 2 +- .../Downloadable/view/frontend/web/{ => js}/downloadable.js | 0 .../Magento/GiftMessage/view/frontend/requirejs-config.js | 4 ++-- .../GiftMessage/view/frontend/web/{ => js}/extra-options.js | 0 .../GiftMessage/view/frontend/web/{ => js}/gift-options.js | 0 app/code/Magento/Payment/view/frontend/requirejs-config.js | 2 +- .../Magento/Payment/view/frontend/web/{ => js}/cc-type.js | 0 .../Magento/Payment/view/frontend/web/{ => js}/transparent.js | 0 app/code/Magento/Paypal/view/base/requirejs-config.js | 2 +- app/code/Magento/Paypal/view/frontend/requirejs-config.js | 2 +- .../Magento/Paypal/view/frontend/web/{ => js}/order-review.js | 0 app/code/Magento/Sales/view/frontend/requirejs-config.js | 4 ++-- .../Magento/Sales/view/frontend/web/{ => js}/gift-message.js | 0 .../Sales/view/frontend/web/{ => js}/orders-returns.js | 0 app/code/Magento/Search/view/frontend/requirejs-config.js | 2 +- .../Magento/Search/view/frontend/web/{ => js}/form-mini.js | 0 .../Magento/SendFriend/view/frontend/templates/send.phtml | 2 +- .../SendFriend/view/frontend/web/{ => js}/back-event.js | 0 .../Magento/Translation/view/frontend/requirejs-config.js | 2 +- .../Translation/view/frontend/web/{ => js}/add-class.js | 0 app/code/Magento/Weee/view/frontend/requirejs-config.js | 2 +- .../Magento/Weee/view/frontend/web/{ => js}/tax-toggle.js | 0 29 files changed, 16 insertions(+), 16 deletions(-) rename app/code/Magento/Captcha/view/frontend/web/{ => js}/captcha.js (100%) rename app/code/Magento/Captcha/view/frontend/web/{ => js}/onepage.js (100%) rename app/code/Magento/Customer/view/frontend/web/{ => js}/address.js (100%) rename app/code/Magento/Customer/view/frontend/web/{ => js}/change-email-password.js (100%) rename app/code/Magento/Downloadable/view/frontend/web/{ => js}/downloadable.js (100%) rename app/code/Magento/GiftMessage/view/frontend/web/{ => js}/extra-options.js (100%) rename app/code/Magento/GiftMessage/view/frontend/web/{ => js}/gift-options.js (100%) rename app/code/Magento/Payment/view/frontend/web/{ => js}/cc-type.js (100%) rename app/code/Magento/Payment/view/frontend/web/{ => js}/transparent.js (100%) rename app/code/Magento/Paypal/view/frontend/web/{ => js}/order-review.js (100%) rename app/code/Magento/Sales/view/frontend/web/{ => js}/gift-message.js (100%) rename app/code/Magento/Sales/view/frontend/web/{ => js}/orders-returns.js (100%) rename app/code/Magento/Search/view/frontend/web/{ => js}/form-mini.js (100%) rename app/code/Magento/SendFriend/view/frontend/web/{ => js}/back-event.js (100%) rename app/code/Magento/Translation/view/frontend/web/{ => js}/add-class.js (100%) rename app/code/Magento/Weee/view/frontend/web/{ => js}/tax-toggle.js (100%) diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js index 8edc38dce6f60..2b57e5cc2fb0d 100644 --- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js +++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - transparent: 'Magento_Payment/transparent' + transparent: 'Magento_Payment/js/transparent' } } }; diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js index 3b322711f8b1f..0f3394e41e7c2 100644 --- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js +++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - captcha: 'Magento_Captcha/captcha' + captcha: 'Magento_Captcha/js/captcha' } } }; diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js similarity index 100% rename from app/code/Magento/Captcha/view/frontend/web/captcha.js rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/js/onepage.js similarity index 100% rename from app/code/Magento/Captcha/view/frontend/web/onepage.js rename to app/code/Magento/Captcha/view/frontend/web/js/onepage.js diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js index 20dd53ded11c9..967bbdcc0e663 100644 --- a/app/code/Magento/Customer/view/frontend/requirejs-config.js +++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js @@ -7,8 +7,8 @@ var config = { map: { '*': { checkoutBalance: 'Magento_Customer/js/checkout-balance', - address: 'Magento_Customer/address', - changeEmailPassword: 'Magento_Customer/change-email-password', + address: 'Magento_Customer/js/address', + changeEmailPassword: 'Magento_Customer/js/change-email-password', passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator', zxcvbn: 'Magento_Customer/js/zxcvbn', addressValidation: 'Magento_Customer/js/addressValidation' diff --git a/app/code/Magento/Customer/view/frontend/web/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js similarity index 100% rename from app/code/Magento/Customer/view/frontend/web/address.js rename to app/code/Magento/Customer/view/frontend/web/js/address.js diff --git a/app/code/Magento/Customer/view/frontend/web/change-email-password.js b/app/code/Magento/Customer/view/frontend/web/js/change-email-password.js similarity index 100% rename from app/code/Magento/Customer/view/frontend/web/change-email-password.js rename to app/code/Magento/Customer/view/frontend/web/js/change-email-password.js diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js index 59d0558decd16..c3d33949eb012 100644 --- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js +++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - downloadable: 'Magento_Downloadable/downloadable' + downloadable: 'Magento_Downloadable/js/downloadable' } } }; diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js similarity index 100% rename from app/code/Magento/Downloadable/view/frontend/web/downloadable.js rename to app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js index db33efeba1a94..c3f8ecc45da38 100644 --- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js +++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js @@ -6,8 +6,8 @@ var config = { map: { '*': { - giftOptions: 'Magento_GiftMessage/gift-options', - extraOptions: 'Magento_GiftMessage/extra-options' + giftOptions: 'Magento_GiftMessage/js/gift-options', + extraOptions: 'Magento_GiftMessage/js/extra-options' } } }; diff --git a/app/code/Magento/GiftMessage/view/frontend/web/extra-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js similarity index 100% rename from app/code/Magento/GiftMessage/view/frontend/web/extra-options.js rename to app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js diff --git a/app/code/Magento/GiftMessage/view/frontend/web/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js similarity index 100% rename from app/code/Magento/GiftMessage/view/frontend/web/gift-options.js rename to app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js index 70f93854ead4b..efa24d129e8ec 100644 --- a/app/code/Magento/Payment/view/frontend/requirejs-config.js +++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - creditCardType: 'Magento_Payment/cc-type' + creditCardType: 'Magento_Payment/js/cc-type' } } }; diff --git a/app/code/Magento/Payment/view/frontend/web/cc-type.js b/app/code/Magento/Payment/view/frontend/web/js/cc-type.js similarity index 100% rename from app/code/Magento/Payment/view/frontend/web/cc-type.js rename to app/code/Magento/Payment/view/frontend/web/js/cc-type.js diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/js/transparent.js similarity index 100% rename from app/code/Magento/Payment/view/frontend/web/transparent.js rename to app/code/Magento/Payment/view/frontend/web/js/transparent.js diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js index 8edc38dce6f60..2b57e5cc2fb0d 100644 --- a/app/code/Magento/Paypal/view/base/requirejs-config.js +++ b/app/code/Magento/Paypal/view/base/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - transparent: 'Magento_Payment/transparent' + transparent: 'Magento_Payment/js/transparent' } } }; diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js index d2cf3f9a0ce7d..f2ac876f560c9 100644 --- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js +++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - orderReview: 'Magento_Paypal/order-review', + orderReview: 'Magento_Paypal/js/order-review', paypalCheckout: 'Magento_Paypal/js/paypal-checkout' } }, diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js similarity index 100% rename from app/code/Magento/Paypal/view/frontend/web/order-review.js rename to app/code/Magento/Paypal/view/frontend/web/js/order-review.js diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js index 04778765f3c97..658960c749f8c 100644 --- a/app/code/Magento/Sales/view/frontend/requirejs-config.js +++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js @@ -6,8 +6,8 @@ var config = { map: { '*': { - giftMessage: 'Magento_Sales/gift-message', - ordersReturns: 'Magento_Sales/orders-returns' + giftMessage: 'Magento_Sales/js/gift-message', + ordersReturns: 'Magento_Sales/js/orders-returns' } } }; diff --git a/app/code/Magento/Sales/view/frontend/web/gift-message.js b/app/code/Magento/Sales/view/frontend/web/js/gift-message.js similarity index 100% rename from app/code/Magento/Sales/view/frontend/web/gift-message.js rename to app/code/Magento/Sales/view/frontend/web/js/gift-message.js diff --git a/app/code/Magento/Sales/view/frontend/web/orders-returns.js b/app/code/Magento/Sales/view/frontend/web/js/orders-returns.js similarity index 100% rename from app/code/Magento/Sales/view/frontend/web/orders-returns.js rename to app/code/Magento/Sales/view/frontend/web/js/orders-returns.js diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js index c38cba4315eac..cca294dd3689d 100644 --- a/app/code/Magento/Search/view/frontend/requirejs-config.js +++ b/app/code/Magento/Search/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - quickSearch: 'Magento_Search/form-mini' + quickSearch: 'Magento_Search/js/form-mini' } } }; diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js similarity index 100% rename from app/code/Magento/Search/view/frontend/web/form-mini.js rename to app/code/Magento/Search/view/frontend/web/js/form-mini.js diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml index 7a972cd5f01c5..1fe4ae381420e 100644 --- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml +++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml @@ -121,7 +121,7 @@ diff --git a/app/code/Magento/SendFriend/view/frontend/web/back-event.js b/app/code/Magento/SendFriend/view/frontend/web/js/back-event.js similarity index 100% rename from app/code/Magento/SendFriend/view/frontend/web/back-event.js rename to app/code/Magento/SendFriend/view/frontend/web/js/back-event.js diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js index 47ccaf5a33e57..4414f0d153ee8 100644 --- a/app/code/Magento/Translation/view/frontend/requirejs-config.js +++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js @@ -7,7 +7,7 @@ var config = { map: { '*': { editTrigger: 'mage/edit-trigger', - addClass: 'Magento_Translation/add-class' + addClass: 'Magento_Translation/js/add-class' } }, deps: [ diff --git a/app/code/Magento/Translation/view/frontend/web/add-class.js b/app/code/Magento/Translation/view/frontend/web/js/add-class.js similarity index 100% rename from app/code/Magento/Translation/view/frontend/web/add-class.js rename to app/code/Magento/Translation/view/frontend/web/js/add-class.js diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js index 49dfb6b9d469b..5b1b3a0f7ec73 100644 --- a/app/code/Magento/Weee/view/frontend/requirejs-config.js +++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js @@ -6,7 +6,7 @@ var config = { map: { '*': { - 'taxToggle': 'Magento_Weee/tax-toggle' + 'taxToggle': 'Magento_Weee/js/tax-toggle' } } }; diff --git a/app/code/Magento/Weee/view/frontend/web/tax-toggle.js b/app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js similarity index 100% rename from app/code/Magento/Weee/view/frontend/web/tax-toggle.js rename to app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js From e0b09fdc6db266015b3296fe8a272db7c3ba7d3e Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 19 Jul 2018 12:29:32 +0530 Subject: [PATCH 2/6] [changes as per suggession] --- .../Magento/Authorizenet/view/frontend/requirejs-config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js index 2b57e5cc2fb0d..8c4c90bf111de 100644 --- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js +++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - transparent: 'Magento_Payment/js/transparent' + transparent: 'Magento_Payment/js/transparent', + 'Magento_Payment/transparent': 'Magento_Payment/js/transparent' } } }; From c74f9e210a554f9462d8bfaa9e34b46e5542b337 Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 19 Jul 2018 15:07:33 +0530 Subject: [PATCH 3/6] [changes as per suggession] --- app/code/Magento/Captcha/view/frontend/requirejs-config.js | 3 ++- app/code/Magento/Customer/view/frontend/requirejs-config.js | 4 +++- .../Magento/Downloadable/view/frontend/requirejs-config.js | 3 ++- .../Magento/GiftMessage/view/frontend/requirejs-config.js | 4 +++- app/code/Magento/Payment/view/frontend/requirejs-config.js | 3 ++- app/code/Magento/Paypal/view/base/requirejs-config.js | 3 ++- app/code/Magento/Paypal/view/frontend/requirejs-config.js | 1 + app/code/Magento/Sales/view/frontend/requirejs-config.js | 4 +++- app/code/Magento/Search/view/frontend/requirejs-config.js | 3 ++- .../Magento/Translation/view/frontend/requirejs-config.js | 3 ++- app/code/Magento/Weee/view/frontend/requirejs-config.js | 3 ++- 11 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js index 0f3394e41e7c2..42c80632d3e92 100644 --- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js +++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - captcha: 'Magento_Captcha/js/captcha' + captcha: 'Magento_Captcha/js/captcha', + 'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha' } } }; diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js index 967bbdcc0e663..52a1458fa5778 100644 --- a/app/code/Magento/Customer/view/frontend/requirejs-config.js +++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js @@ -11,7 +11,9 @@ var config = { changeEmailPassword: 'Magento_Customer/js/change-email-password', passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator', zxcvbn: 'Magento_Customer/js/zxcvbn', - addressValidation: 'Magento_Customer/js/addressValidation' + addressValidation: 'Magento_Customer/js/addressValidation', + 'Magento_Customer/address': 'Magento_Customer/js/address', + 'Magento_Customer/changeEmailPassword': 'Magento_Customer/js/change-email-password', } } }; diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js index c3d33949eb012..f615966d801f7 100644 --- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js +++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - downloadable: 'Magento_Downloadable/js/downloadable' + downloadable: 'Magento_Downloadable/js/downloadable', + 'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable' } } }; diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js index c3f8ecc45da38..12359f832e2d1 100644 --- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js +++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js @@ -7,7 +7,9 @@ var config = { map: { '*': { giftOptions: 'Magento_GiftMessage/js/gift-options', - extraOptions: 'Magento_GiftMessage/js/extra-options' + extraOptions: 'Magento_GiftMessage/js/extra-options', + 'Magento_GiftMessage/giftOptions': 'Magento_GiftMessage/js/gift-options', + 'Magento_GiftMessage/extraOptions': 'Magento_GiftMessage/js/extra-options' } } }; diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js index efa24d129e8ec..32ed12274b14c 100644 --- a/app/code/Magento/Payment/view/frontend/requirejs-config.js +++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - creditCardType: 'Magento_Payment/js/cc-type' + creditCardType: 'Magento_Payment/js/cc-type', + 'Magento_Payment/creditCardType': 'Magento_Payment/js/cc-type' } } }; diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js index 2b57e5cc2fb0d..8c4c90bf111de 100644 --- a/app/code/Magento/Paypal/view/base/requirejs-config.js +++ b/app/code/Magento/Paypal/view/base/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - transparent: 'Magento_Payment/js/transparent' + transparent: 'Magento_Payment/js/transparent', + 'Magento_Payment/transparent': 'Magento_Payment/js/transparent' } } }; diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js index f2ac876f560c9..9be06b7c39261 100644 --- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js +++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js @@ -7,6 +7,7 @@ var config = { map: { '*': { orderReview: 'Magento_Paypal/js/order-review', + 'Magento_Paypal/orderReview': 'Magento_Paypal/js/order-review', paypalCheckout: 'Magento_Paypal/js/paypal-checkout' } }, diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js index 658960c749f8c..4995dc22a80bd 100644 --- a/app/code/Magento/Sales/view/frontend/requirejs-config.js +++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js @@ -7,7 +7,9 @@ var config = { map: { '*': { giftMessage: 'Magento_Sales/js/gift-message', - ordersReturns: 'Magento_Sales/js/orders-returns' + ordersReturns: 'Magento_Sales/js/orders-returns', + 'Magento_Sales/giftMessage': 'Magento_Sales/js/gift-message', + 'Magento_Sales/ordersReturns': 'Magento_Sales/js/orders-returns' } } }; diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js index cca294dd3689d..1296608b7143c 100644 --- a/app/code/Magento/Search/view/frontend/requirejs-config.js +++ b/app/code/Magento/Search/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - quickSearch: 'Magento_Search/js/form-mini' + quickSearch: 'Magento_Search/js/form-mini', + 'Magento_Search/quickSearch': 'Magento_Search/js/form-mini' } } }; diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js index 4414f0d153ee8..59259fd6472d4 100644 --- a/app/code/Magento/Translation/view/frontend/requirejs-config.js +++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js @@ -7,7 +7,8 @@ var config = { map: { '*': { editTrigger: 'mage/edit-trigger', - addClass: 'Magento_Translation/js/add-class' + addClass: 'Magento_Translation/js/add-class', + 'Magento_Translation/addClass': 'Magento_Translation/js/add-class' } }, deps: [ diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js index 5b1b3a0f7ec73..573c04d3d7393 100644 --- a/app/code/Magento/Weee/view/frontend/requirejs-config.js +++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js @@ -6,7 +6,8 @@ var config = { map: { '*': { - 'taxToggle': 'Magento_Weee/js/tax-toggle' + 'taxToggle': 'Magento_Weee/js/tax-toggle', + 'Magento_Weee/taxToggle': 'Magento_Weee/js/tax-toggle' } } }; From 6ad9ea419bd09ffc5b17bd4342f432958ba395ff Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 19 Jul 2018 15:51:49 +0530 Subject: [PATCH 4/6] [changes as per suggession] --- app/code/Magento/Customer/view/frontend/requirejs-config.js | 2 +- .../Magento/GiftMessage/view/frontend/requirejs-config.js | 4 ++-- app/code/Magento/Payment/view/frontend/requirejs-config.js | 2 +- app/code/Magento/Paypal/view/frontend/requirejs-config.js | 2 +- app/code/Magento/Sales/view/frontend/requirejs-config.js | 4 ++-- app/code/Magento/Search/view/frontend/requirejs-config.js | 2 +- .../Magento/Translation/view/frontend/requirejs-config.js | 2 +- app/code/Magento/Weee/view/frontend/requirejs-config.js | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js index 52a1458fa5778..e07a17efe3ca7 100644 --- a/app/code/Magento/Customer/view/frontend/requirejs-config.js +++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js @@ -13,7 +13,7 @@ var config = { zxcvbn: 'Magento_Customer/js/zxcvbn', addressValidation: 'Magento_Customer/js/addressValidation', 'Magento_Customer/address': 'Magento_Customer/js/address', - 'Magento_Customer/changeEmailPassword': 'Magento_Customer/js/change-email-password', + 'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password', } } }; diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js index 12359f832e2d1..f8a463bec37f9 100644 --- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js +++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js @@ -8,8 +8,8 @@ var config = { '*': { giftOptions: 'Magento_GiftMessage/js/gift-options', extraOptions: 'Magento_GiftMessage/js/extra-options', - 'Magento_GiftMessage/giftOptions': 'Magento_GiftMessage/js/gift-options', - 'Magento_GiftMessage/extraOptions': 'Magento_GiftMessage/js/extra-options' + 'Magento_GiftMessage/gift-options': 'Magento_GiftMessage/js/gift-options', + 'Magento_GiftMessage/extra-options': 'Magento_GiftMessage/js/extra-options' } } }; diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js index 32ed12274b14c..949b1554a6f7d 100644 --- a/app/code/Magento/Payment/view/frontend/requirejs-config.js +++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js @@ -7,7 +7,7 @@ var config = { map: { '*': { creditCardType: 'Magento_Payment/js/cc-type', - 'Magento_Payment/creditCardType': 'Magento_Payment/js/cc-type' + 'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type' } } }; diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js index 9be06b7c39261..223ade43d86e5 100644 --- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js +++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js @@ -7,7 +7,7 @@ var config = { map: { '*': { orderReview: 'Magento_Paypal/js/order-review', - 'Magento_Paypal/orderReview': 'Magento_Paypal/js/order-review', + 'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review', paypalCheckout: 'Magento_Paypal/js/paypal-checkout' } }, diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js index 4995dc22a80bd..4d323684afff6 100644 --- a/app/code/Magento/Sales/view/frontend/requirejs-config.js +++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js @@ -8,8 +8,8 @@ var config = { '*': { giftMessage: 'Magento_Sales/js/gift-message', ordersReturns: 'Magento_Sales/js/orders-returns', - 'Magento_Sales/giftMessage': 'Magento_Sales/js/gift-message', - 'Magento_Sales/ordersReturns': 'Magento_Sales/js/orders-returns' + 'Magento_Sales/gift-message': 'Magento_Sales/js/gift-message', + 'Magento_Sales/orders-returns': 'Magento_Sales/js/orders-returns' } } }; diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js index 1296608b7143c..d945944daa1b0 100644 --- a/app/code/Magento/Search/view/frontend/requirejs-config.js +++ b/app/code/Magento/Search/view/frontend/requirejs-config.js @@ -7,7 +7,7 @@ var config = { map: { '*': { quickSearch: 'Magento_Search/js/form-mini', - 'Magento_Search/quickSearch': 'Magento_Search/js/form-mini' + 'Magento_Search/form-mini': 'Magento_Search/js/form-mini' } } }; diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js index 59259fd6472d4..b4b3ce0f8c554 100644 --- a/app/code/Magento/Translation/view/frontend/requirejs-config.js +++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js @@ -8,7 +8,7 @@ var config = { '*': { editTrigger: 'mage/edit-trigger', addClass: 'Magento_Translation/js/add-class', - 'Magento_Translation/addClass': 'Magento_Translation/js/add-class' + 'Magento_Translation/add-class': 'Magento_Translation/js/add-class' } }, deps: [ diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js index 573c04d3d7393..94c59da65216d 100644 --- a/app/code/Magento/Weee/view/frontend/requirejs-config.js +++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js @@ -7,7 +7,7 @@ var config = { map: { '*': { 'taxToggle': 'Magento_Weee/js/tax-toggle', - 'Magento_Weee/taxToggle': 'Magento_Weee/js/tax-toggle' + 'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle' } } }; From e2558dc6c0729c6f99cb0688048048a1a3483baf Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 19 Jul 2018 16:10:23 +0530 Subject: [PATCH 5/6] Created new required js --- .../SendFriend/view/frontend/requirejs-config.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/code/Magento/SendFriend/view/frontend/requirejs-config.js diff --git a/app/code/Magento/SendFriend/view/frontend/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js new file mode 100644 index 0000000000000..f356cebe57946 --- /dev/null +++ b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js @@ -0,0 +1,12 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +var config = { + map: { + '*': { + 'Magento_SendFriend/back-event': 'Magento_SendFriend/js/back-event' + } + } +}; From 230145092ca1b385148fee7867ef927780674c50 Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 19 Jul 2018 17:55:57 +0530 Subject: [PATCH 6/6] Resolved Travis error --- app/code/Magento/Customer/view/frontend/requirejs-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js index e07a17efe3ca7..f1bf5c1d1b67f 100644 --- a/app/code/Magento/Customer/view/frontend/requirejs-config.js +++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js @@ -13,7 +13,7 @@ var config = { zxcvbn: 'Magento_Customer/js/zxcvbn', addressValidation: 'Magento_Customer/js/addressValidation', 'Magento_Customer/address': 'Magento_Customer/js/address', - 'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password', + 'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password' } } };