Skip to content

Commit b9ec43e

Browse files
committed
Merge branch 'jquery-upgrade' of github.com:magento-lynx/magento2ce into MC-41897
2 parents b211fc9 + 3a7c3cd commit b9ec43e

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

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/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/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/Review/view/frontend/web/js/process-reviews.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ define([
2727
event.preventDefault();
2828
});
2929
});
30-
}).complete(function () {
30+
}).always(function () {
3131
if (fromPages == true) { //eslint-disable-line eqeqeq
3232
$('html, body').animate({
3333
scrollTop: $('#reviews').offset().top - 50

dev/tests/js/jasmine/tests/lib/mage/translate-inline.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ define([
8989
expect(request.data).toBe(expectedEequestData);
9090

9191
return {
92-
complete: jasmine.createSpy()
92+
always: jasmine.createSpy()
9393
};
9494
});
9595

lib/web/mage/translate-inline.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ define([
149149
data: parameters,
150150
loaderContext: this.element,
151151
showLoader: true
152-
}).complete($.proxy(this._formSubmitComplete, this));
152+
}).always($.proxy(this._formSubmitComplete, this));
153153
},
154154

155155
/**

0 commit comments

Comments
 (0)