Skip to content

Commit 574d9f8

Browse files
committed
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into tinymce3
2 parents e8d8ba4 + 5eef670 commit 574d9f8

File tree

68 files changed

+253
-154
lines changed

Some content is hidden

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

68 files changed

+253
-154
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>

0 commit comments

Comments
 (0)