Skip to content

Commit 5eef670

Browse files
sivaschenkosivaschenko
authored
Merge pull request #6842 from magento-lynx/jquery-upgrade
[Lynx] jQuery upgrade related refactoring
2 parents 3fffab8 + affa4ad commit 5eef670

File tree

62 files changed

+137
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+137
-136
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $viewModel = $block->getViewModel();
1919
?>
2020
<div class="dashboard-diagram">
2121
<div class="dashboard-diagram-graph">
22-
<canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"/>
22+
<canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"></canvas>
2323
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
2424
'display:none',
2525
'#chart_' . $escaper->escapeJs($block->getData('html_id')) . '_period'

‎app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ define([
6969

7070
} else {
7171
$('#preview_selected_store').val(scopeId);
72-
$('#preview_form').submit();
72+
$('#preview_form').trigger('submit');
7373

7474
$('.store-switcher .dropdown-menu li a').each(function () {
7575
var $this = $(this);

‎app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ define([
118118
},
119119
dataType: 'json',
120120
context: $('body')
121-
}).success(function (data) {
121+
}).done(function (data) {
122122
var $suggest;
123123

124124
if (!data.error) {
@@ -135,7 +135,7 @@ define([
135135
} else {
136136
$('#new_category_messages').html(data.messages);
137137
}
138-
}).complete(
138+
}).always(
139139
function () {
140140
thisButton.prop('disabled', false);
141141
}

‎app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ protected function _getJs($quantityFieldId, $inStockFieldId)
256256
};
257257
$.each(fieldsAssociations, function(generalTabField, advancedTabField) {
258258
$('#' + generalTabField + ', #' + advancedTabField)
259-
.bind('focus blur change keyup click', filler)
260-
.bind('keyup change blur', disabler)
259+
.on('focus blur change keyup click', filler)
260+
.on('keyup change blur', disabler)
261261
.trigger('change');
262262
});
263263

‎app/code/Magento/Checkout/view/frontend/web/js/action/get-totals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define([
3838
quote.setTotals(response);
3939
deferred.resolve();
4040
}
41-
}).error(function (response) {
41+
}).fail(function (response) {
4242
totals.isLoading(false);
4343
deferred.reject();
4444
errorProcessor.process(response);

‎app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ define([
125125
.on('submit', function () {
126126
$(document.body).trigger('processStart');
127127
})
128-
.submit();
128+
.trigger('submit');
129129
}
130130
});
131131

‎app/code/Magento/Checkout/view/frontend/web/js/discount-codes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ define([
2121
$(this.options.applyButton).on('click', $.proxy(function () {
2222
this.couponCode.attr('data-validate', '{required:true}');
2323
this.removeCoupon.attr('value', '0');
24-
$(this.element).validation().submit();
24+
$(this.element).validation().trigger('submit');
2525
}, this));
2626

2727
$(this.options.cancelButton).on('click', $.proxy(function () {
2828
this.couponCode.removeAttr('data-validate');
2929
this.removeCoupon.attr('value', '1');
30-
this.element.submit();
30+
this.element.trigger('submit');
3131
}, this));
3232
}
3333
});

‎app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ define(
3131
function (response) {
3232
errorProcessor.process(response, messageContainer);
3333
}
34-
).success(
34+
).done(
3535
function (response) {
3636
var clearData = {
3737
'selectedShippingAddress': null,

‎app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ define([
8989
.attr('name', 'update_cart_action').attr('value', 'empty_cart');
9090

9191
if ($(this.options.emptyCartButton).parents('form').length > 0) {
92-
$(this.options.emptyCartButton).parents('form').submit();
92+
$(this.options.emptyCartButton).parents('form').trigger('submit');
9393
}
9494
}
9595
});

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<label data-bind="attr: {for: 'billing-address-same-as-shipping-' + getCode($parent)}"><span
1212
data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
1313
</div>
14-
<render args="detailsTemplate"/>
14+
<render args="detailsTemplate"></render>
1515
<fieldset class="fieldset" data-bind="visible: !isAddressDetailsVisible()">
16-
<each args="getRegion('billing-address-list')" render="" />
16+
<each args="getRegion('billing-address-list')" render=""></each>
1717
<div data-bind="fadeVisible: isAddressFormVisible">
18-
<render args="formTemplate"/>
18+
<render args="formTemplate"></render>
1919
</div>
20-
<render args="actionsTemplate"/>
20+
<render args="actionsTemplate"></render>
2121
</fieldset>
2222
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<button class="action action-update"
1010
type="button"
1111
click="updateAddress">
12-
<span translate="'Update'"/>
12+
<span translate="'Update'"></span>
1313
</button>
1414
<button class="action action-cancel"
1515
type="button"
1616
click="cancelAddressEdit"
1717
visible="canUseCancelBillingAddress()">
18-
<span translate="'Cancel'"/>
18+
<span translate="'Cancel'"></span>
1919
</button>
2020
</div>
2121
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
*/
66
-->
77
<div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
8-
<text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
9-
<text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
10-
<text args="currentBillingAddress().street.join(', ')"/><br/>
11-
<text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
12-
<text args="getCountryName(currentBillingAddress().countryId)"/><br/>
8+
<text args="currentBillingAddress().prefix"></text> <text args="currentBillingAddress().firstname"></text>
9+
<text args="currentBillingAddress().middlename"></text>
10+
<text args="currentBillingAddress().lastname"></text> <text args="currentBillingAddress().suffix"></text><br/>
11+
<text args="currentBillingAddress().street.join(', ')"></text><br/>
12+
<text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
13+
<text args="currentBillingAddress().postcode"></text><br/>
14+
<text args="getCountryName(currentBillingAddress().countryId)"></text><br/>
1315
<a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
1416

1517
<each args="data: currentBillingAddress().customAttributes, as: 'element'">
16-
<text args="$parent.getCustomAttributeLabel(element)"/>
18+
<text args="$parent.getCustomAttributeLabel(element)"></text>
1719
<br/>
1820
</each>
1921

‎app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"/>
3131
<label class="label" data-bind="attr: {for: 's_method_' + carrier_code + '_' + method_code}">
3232
<!-- ko text: $data.method_title --><!-- /ko -->
33-
<each args="element.getRegion('price')" render="" />
33+
<each args="element.getRegion('price')" render=""></each>
3434
</label>
3535
<!-- /ko -->
3636
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<div class="block-title">
88
<strong>
9-
<span class="text" translate="'My Cart'"/>
9+
<span class="text" translate="'My Cart'"></span>
1010
<span
1111
class="qty empty"
1212
text="getCartParam('summary_count')"
@@ -27,24 +27,24 @@
2727
},
2828
click: closeMinicart()
2929
">
30-
<span translate="'Close'"/>
30+
<span translate="'Close'"></span>
3131
</button>
3232

3333
<if args="getCartParam('summary_count')">
3434
<div class="items-total">
35-
<span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
36-
<translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
37-
<span class="count" text="getCartParam('summary_count')"/>
35+
<span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"></span>
36+
<translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"></translate>
37+
<span class="count" text="getCartParam('summary_count')"></span>
3838
<!-- ko if: (getCartParam('summary_count') > 1) -->
39-
<span translate="'Items in Cart'"/>
39+
<span translate="'Items in Cart'"></span>
4040
<!--/ko-->
4141
<!-- ko if: (getCartParam('summary_count') === 1) -->
42-
<span translate="'Item in Cart'"/>
42+
<span translate="'Item in Cart'"></span>
4343
<!--/ko-->
4444
</div>
4545

46-
<each args="getRegion('subtotalContainer')" render=""/>
47-
<each args="getRegion('extraInfo')" render=""/>
46+
<each args="getRegion('subtotalContainer')" render=""></each>
47+
<each args="getRegion('extraInfo')" render=""></each>
4848

4949
<div class="actions" if="getCartParam('possible_onepage_checkout')">
5050
<div class="primary">
@@ -59,34 +59,32 @@
5959
},
6060
click: closeMinicart()
6161
"
62-
translate="'Proceed to Checkout'"
63-
/>
62+
translate="'Proceed to Checkout'">
63+
</button>
6464
<div data-bind="html: getCartParamUnsanitizedHtml('extra_actions')"></div>
6565
</div>
6666
</div>
6767
</if>
6868

6969
<if args="getCartParam('summary_count')">
70-
<strong class="subtitle" translate="'Recently added item(s)'"/>
70+
<strong class="subtitle" translate="'Recently added item(s)'"></strong>
7171
<div data-action="scroll" class="minicart-items-wrapper">
7272
<ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartItems(), as: 'item' }">
7373
<each args="$parent.getRegion($parent.getItemRenderer(item.product_type))"
74-
render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"
75-
/>
74+
render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"></each>
7675
</ol>
7776
</div>
7877
</if>
7978

8079
<ifnot args="getCartParam('summary_count')">
8180
<strong class="subtitle empty"
82-
translate="'You have no items in your shopping cart.'"
83-
/>
81+
translate="'You have no items in your shopping cart.'"></strong>
8482
<if args="getCartParam('cart_empty_message')">
85-
<p class="minicart empty text" text="getCartParam('cart_empty_message')"/>
83+
<p class="minicart empty text" text="getCartParam('cart_empty_message')"></p>
8684
<div class="actions">
8785
<div class="secondary">
8886
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
89-
<span translate="'View and Edit Cart'"/>
87+
<span translate="'View and Edit Cart'"></span>
9088
</a>
9189
</div>
9290
</div>
@@ -96,13 +94,13 @@
9694
<div class="actions" if="getCartParam('summary_count')">
9795
<div class="secondary">
9896
<a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
99-
<span translate="'View and Edit Cart'"/>
97+
<span translate="'View and Edit Cart'"></span>
10098
</a>
10199
</div>
102100
</div>
103101

104102
<div id="minicart-widgets" class="minicart-widgets" if="regionHasElements('promotion')">
105-
<each args="getRegion('promotion')" render=""/>
103+
<each args="getRegion('promotion')" render=""></each>
106104
</div>
107105
</div>
108-
<each args="getRegion('sign-in-popup')" render=""/>
106+
<each args="getRegion('sign-in-popup')" render=""></each>

‎app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}, value: qty"
8383
type="number"
8484
size="4"
85-
class="item-qty cart-item-qty">
85+
class="item-qty cart-item-qty"/>
8686
<button data-bind="attr: {
8787
id: 'update-cart-item-'+item_id,
8888
'data-cart-item': item_id,

‎app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class="step-title"
1414
data-role="title">
1515
</div>
16-
<each args="data: getRegion($group().displayArea), as: 'method'" render=""/>
16+
<each args="data: getRegion($group().displayArea), as: 'method'" render=""></each>
1717
</div>
1818
</div>
1919
<div ifnot="isPaymentMethodsAvailable()"

‎app/code/Magento/Checkout/view/frontend/web/template/registration.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
1313
<p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
1414
<a class="action primary" data-bind="attr: { href: getUrl() }">
15-
<span data-bind="i18n: 'Create an Account'" />
15+
<span data-bind="i18n: 'Create an Account'"></span>
1616
</a>
1717
<!--/ko-->
1818
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
*/
66
-->
77
<div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
8-
<text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
9-
<text args="address().lastname"/> <text args="address().suffix"/><br/>
10-
<text args="_.values(address().street).join(', ')"/><br/>
11-
<text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
12-
<text args="getCountryName(address().countryId)"/><br/>
8+
<text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
9+
<text args="address().lastname"></text> <text args="address().suffix"></text><br/>
10+
<text args="_.values(address().street).join(', ')"></text><br/>
11+
<text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
12+
<text args="getCountryName(address().countryId)"></text><br/>
1313
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
1414

1515
<each args="data: address().customAttributes, as: 'element'">
16-
<text args="$parent.getCustomAttributeLabel(element)"/>
16+
<text args="$parent.getCustomAttributeLabel(element)"></text>
1717
<br/>
1818
</each>
1919

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
</td>
1818
<!-- ko ifnot: (method.error_message) -->
1919
<td class="col col-price">
20-
<each args="element.getRegion('price')" render="" />
20+
<each args="element.getRegion('price')" render=""></each>
2121
</td>
2222
<!-- /ko -->
2323
<td class="col col-method"
2424
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
25-
text="method.method_title" />
25+
text="method.method_title"></td>
2626
<td class="col col-carrier"
2727
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
28-
text="method.carrier_title" />
28+
text="method.carrier_title"></td>
2929
</tr>
3030
<tr class="row row-error"
3131
if="method.error_message">
@@ -35,7 +35,7 @@
3535
</div>
3636
<span class="no-display">
3737
<input type="radio"
38-
attr="'value' : method.method_code, 'id': 's_method_' + method.method_code" />
38+
attr="'value' : method.method_code, 'id': 's_method_' + method.method_code">
3939
</span>
4040
</td>
4141
</tr>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
*/
66
-->
77
<if args="visible()">
8-
<text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
9-
<text args="address().lastname"/> <text args="address().suffix"/><br/>
10-
<text args="_.values(address().street).join(', ')"/><br/>
11-
<text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
12-
<text args="getCountryName(address().countryId)"/><br/>
8+
<text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
9+
<text args="address().lastname"></text> <text args="address().suffix"></text><br/>
10+
<text args="_.values(address().street).join(', ')"></text><br/>
11+
<text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
12+
<text args="getCountryName(address().countryId)"></text><br/>
1313
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
1414

1515
<each args="data: address().customAttributes, as: 'element'">
16-
<text args="$parent.getCustomAttributeLabel(element)"/>
16+
<text args="$parent.getCustomAttributeLabel(element)"></text>
1717
<br/>
1818
</each>
1919
</if>

‎app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': isItemsBlockExpanded()}}">
88
<div class="title" data-role="title">
99
<strong role="heading" aria-level="1">
10-
<translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
11-
<translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
10+
<translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"></translate>
11+
<translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"></translate>
1212
<span data-bind="text: getCartSummaryItemsCount()"></span>
13-
<translate args="'Item in Cart'" if="getCartSummaryItemsCount() === 1"/>
14-
<translate args="'Items in Cart'" if="getCartSummaryItemsCount() > 1"/>
13+
<translate args="'Item in Cart'" if="getCartSummaryItemsCount() === 1"></translate>
14+
<translate args="'Items in Cart'" if="getCartSummaryItemsCount() > 1"></translate>
1515
</strong>
1616
</div>
1717
<div class="content minicart-items" data-role="content">
@@ -20,7 +20,7 @@
2020
<each args="items()">
2121
<li class="product-item">
2222
<div class="product">
23-
<each args="$parent.elems()" render=""/>
23+
<each args="$parent.elems()" render=""></each>
2424
</div>
2525
</li>
2626
</each>

0 commit comments

Comments
 (0)