Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved : JS files located outside the web/js directory #16582

Merged
merged 8 commits into from
Aug 7, 2018
Merged

Resolved : JS files located outside the web/js directory #16582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8653ba1
[Changed front js file locations]
hitesh-wagento Jul 6, 2018
e0b09fd
[changes as per suggession]
hitesh-wagento Jul 19, 2018
45306b4
Merge remote-tracking branch 'origin/2.2-develop' into js-files-locat…
hitesh-wagento Jul 19, 2018
9b719be
Merge remote-tracking branch 'upstream/2.2-develop' into js-files-loc…
hitesh-wagento Jul 19, 2018
c74f9e2
[changes as per suggession]
hitesh-wagento Jul 19, 2018
6ad9ea4
[changes as per suggession]
hitesh-wagento Jul 19, 2018
e2558dc
Created new required js
hitesh-wagento Jul 19, 2018
2301450
Resolved Travis error
hitesh-wagento Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
transparent: 'Magento_Payment/transparent'
transparent: 'Magento_Payment/js/transparent',
'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
}
}
};
3 changes: 2 additions & 1 deletion app/code/Magento/Captcha/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
captcha: 'Magento_Captcha/captcha'
captcha: 'Magento_Captcha/js/captcha',
'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
}
}
};
0 ...ento/Captcha/view/frontend/web/captcha.js → ...o/Captcha/view/frontend/web/js/captcha.js
View file
Open in desktop
File renamed without changes.
0 ...ento/Captcha/view/frontend/web/onepage.js → ...o/Captcha/view/frontend/web/js/onepage.js
View file
Open in desktop
File renamed without changes.
8 changes: 5 additions & 3 deletions app/code/Magento/Customer/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ 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'
addressValidation: 'Magento_Customer/js/addressValidation',
'Magento_Customer/address': 'Magento_Customer/js/address',
'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
}
}
};
0 ...nto/Customer/view/frontend/web/address.js → .../Customer/view/frontend/web/js/address.js
View file
Open in desktop
File renamed without changes.
0 ...iew/frontend/web/change-email-password.js → .../frontend/web/js/change-email-password.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Downloadable/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
downloadable: 'Magento_Downloadable/downloadable'
downloadable: 'Magento_Downloadable/js/downloadable',
'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
}
}
};
0 ...oadable/view/frontend/web/downloadable.js → ...able/view/frontend/web/js/downloadable.js
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
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',
'Magento_GiftMessage/gift-options': 'Magento_GiftMessage/js/gift-options',
'Magento_GiftMessage/extra-options': 'Magento_GiftMessage/js/extra-options'
}
}
};
0 ...essage/view/frontend/web/extra-options.js → ...age/view/frontend/web/js/extra-options.js
View file
Open in desktop
File renamed without changes.
0 ...Message/view/frontend/web/gift-options.js → ...sage/view/frontend/web/js/gift-options.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Payment/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
creditCardType: 'Magento_Payment/cc-type'
creditCardType: 'Magento_Payment/js/cc-type',
'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
}
}
};
0 ...ento/Payment/view/frontend/web/cc-type.js → ...o/Payment/view/frontend/web/js/cc-type.js
View file
Open in desktop
File renamed without changes.
0 .../Payment/view/frontend/web/transparent.js → ...yment/view/frontend/web/js/transparent.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Paypal/view/base/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
transparent: 'Magento_Payment/transparent'
transparent: 'Magento_Payment/js/transparent',
'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
}
}
};
3 changes: 2 additions & 1 deletion app/code/Magento/Paypal/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
orderReview: 'Magento_Paypal/order-review',
orderReview: 'Magento_Paypal/js/order-review',
'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review',
paypalCheckout: 'Magento_Paypal/js/paypal-checkout'
}
},
Expand Down
0 .../Paypal/view/frontend/web/order-review.js → ...ypal/view/frontend/web/js/order-review.js
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions app/code/Magento/Sales/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
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',
'Magento_Sales/gift-message': 'Magento_Sales/js/gift-message',
'Magento_Sales/orders-returns': 'Magento_Sales/js/orders-returns'
}
}
};
0 ...o/Sales/view/frontend/web/gift-message.js → ...ales/view/frontend/web/js/gift-message.js
View file
Open in desktop
File renamed without changes.
0 ...Sales/view/frontend/web/orders-returns.js → ...es/view/frontend/web/js/orders-returns.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Search/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
quickSearch: 'Magento_Search/form-mini'
quickSearch: 'Magento_Search/js/form-mini',
'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
}
}
};
0 ...nto/Search/view/frontend/web/form-mini.js → .../Search/view/frontend/web/js/form-mini.js
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions app/code/Magento/SendFriend/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
}
}
};
2 changes: 1 addition & 1 deletion app/code/Magento/SendFriend/view/frontend/templates/send.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<script type="text/x-magento-init">
{
"a[role='back']": {
"Magento_SendFriend/back-event": {}
"Magento_SendFriend/js/back-event": {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to create mapping between old and new path in requirejs-config.js file in Magento_SendFriend module

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Applied changes as per our slack conversion.

}
}
</script>
0 ...endFriend/view/frontend/web/back-event.js → ...Friend/view/frontend/web/js/back-event.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Translation/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ var config = {
map: {
'*': {
editTrigger: 'mage/edit-trigger',
addClass: 'Magento_Translation/add-class'
addClass: 'Magento_Translation/js/add-class',
'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
}
},
deps: [
Expand Down
0 ...ranslation/view/frontend/web/add-class.js → ...slation/view/frontend/web/js/add-class.js
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion app/code/Magento/Weee/view/frontend/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
var config = {
map: {
'*': {
'taxToggle': 'Magento_Weee/tax-toggle'
'taxToggle': 'Magento_Weee/js/tax-toggle',
'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
}
}
};
0 ...ento/Weee/view/frontend/web/tax-toggle.js → ...o/Weee/view/frontend/web/js/tax-toggle.js
View file
Open in desktop
File renamed without changes.