Skip to content

Commit 03d517c

Browse files
Rrego6Rrego6
committed
AC-1963: Fix deprecated jquery code in magento2 CE
- Removed prototype.js changes
1 parent b0247ea commit 03d517c

File tree

8 files changed

+34
-35
lines changed

8 files changed

+34
-35
lines changed

‎app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ define([
177177
'products[]': request,
178178
'form_key': widget.options.formKey
179179
}, function ($data) {
180-
JSON.parse($data).each(function (el) {
180+
$.each(JSON.parse($data), function (el) {
181181
var i;
182182

183183
el.id = widget.getFreeOptionId(el.id);

‎app/code/Magento/Paypal/view/frontend/web/js/order-review.js

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

151151
/* eslint-disable max-depth */
152152
if (msg) {
153-
if (Array.isArray('array')) {
153+
if (Array.isArray(msg)) {
154154
msg = msg.join('\n');
155155
}
156156
}

‎app/code/Magento/Rule/view/adminhtml/web/rules.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,9 @@ define([
319319
addRuleNewChild: function (elem) {
320320
var parent_id = elem.id.replace(/^.*__(.*)__.*$/, '$1');
321321
var children_ul_id = elem.id.replace(/__/g, ':').replace(/[^:]*$/, 'children').replace(/:/g, '__');
322-
var children_ul = $(this.parent).on('select', '#' + children_ul_id)[0];
323-
var max_id = 0;
324-
var i;
325-
322+
var children_ul = $(this.parent).select('#' + children_ul_id)[0];
323+
var max_id = 0,
324+
i;
326325
var children_inputs = Selector.findChildElements(children_ul, $A(['input.hidden']));
327326

328327
if (children_inputs.length) {

‎app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ define([
6060
this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
6161
this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
6262
addControlButton: function (button) {
63-
var controlButtonArea = $(this.node).on('select','.actions')[0];
63+
var controlButtonArea = $(this.node).select('.actions')[0];
6464
if (typeof controlButtonArea != 'undefined') {
6565
var buttons = controlButtonArea.childElements();
6666
for (var i = 0; i < buttons.length; i++) {
@@ -225,11 +225,11 @@ define([
225225
* @param {String} container
226226
*/
227227
bindAddressFields: function (container) {
228-
var fields = $(container).on('select', 'input', 'select', 'textarea'),
228+
var fields = $(container).select('input', 'select', 'textarea'),
229229
i;
230230

231231
for (i = 0; i < fields.length; i++) {
232-
jQuery(fields[i]).on('change', this.changeAddressField.bind(this));
232+
jQuery(fields[i]).change(this.changeAddressField.bind(this));
233233
}
234234
},
235235

@@ -321,7 +321,7 @@ define([
321321
syncName = fieldName.replace('billing', 'shipping');
322322
}
323323

324-
$(container).on('select', '[name="' + syncName + '"]').each(function (element) {
324+
$(container).select('[name="' + syncName + '"]').each(function (element) {
325325
if (~['input', 'textarea', 'select'].indexOf(element.tagName.toLowerCase())) {
326326
if (element.type === "checkbox") {
327327
element.checked = fieldValue.checked;
@@ -336,7 +336,7 @@ define([
336336
var regionIdElem = false;
337337
var regionIdElemValue = false;
338338

339-
var fields = $(container).on('select', 'input', 'select', 'textarea');
339+
var fields = $(container).select('input', 'select', 'textarea');
340340
var re = /[^\[]*\[[^\]]*\]\[([^\]]*)\](\[(\d)\])?/;
341341
for (var i = 0; i < fields.length; i++) {
342342
// skip input type file @Security error code: 1000
@@ -391,15 +391,15 @@ define([
391391
$('order-shipping_address_customer_address_id').disabled = flag;
392392
}
393393
if ($(this.shippingAddressContainer)) {
394-
var dataFields = $(this.shippingAddressContainer).on('select', 'input', 'select', 'textarea');
394+
var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea');
395395
for (var i = 0; i < dataFields.length; i++) {
396396
dataFields[i].disabled = flag;
397397

398398
if (this.isOnlyVirtualProduct) {
399399
dataFields[i].setValue('');
400400
}
401401
}
402-
var buttons = $(this.shippingAddressContainer).on('select', 'button');
402+
var buttons = $(this.shippingAddressContainer).select('button');
403403
// Add corresponding class to buttons while disabling them
404404
for (i = 0; i < buttons.length; i++) {
405405
buttons[i].disabled = flag;
@@ -521,7 +521,7 @@ define([
521521
}
522522

523523
if (!this.paymentMethod || method) {
524-
$('order-billing_method_form').on('select', 'input', 'select', 'textarea').each(function (elem) {
524+
$('order-billing_method_form').select('input', 'select', 'textarea').each(function (elem) {
525525
if (elem.type != 'radio') elem.disabled = true;
526526
})
527527
}
@@ -572,7 +572,7 @@ define([
572572
return false;
573573
}
574574
var data = {};
575-
var fields = $('payment_form_' + currentMethod).on('select', 'input', 'select');
575+
var fields = $('payment_form_' + currentMethod).select('input', 'select');
576576
for (var i = 0; i < fields.length; i++) {
577577
data[fields[i].name] = fields[i].getValue();
578578
}
@@ -617,8 +617,8 @@ define([
617617
},
618618

619619
productGridRowInit: function (grid, row) {
620-
var checkbox = $(row).on('select', '.checkbox')[0];
621-
var inputs = $(row).on('select', '.input-text');
620+
var checkbox = $(row).select('.checkbox')[0];
621+
var inputs = $(row).select('.input-text');
622622
if (checkbox && inputs.length > 0) {
623623
checkbox.inputElements = inputs;
624624
for (var i = 0; i < inputs.length; i++) {
@@ -913,7 +913,7 @@ define([
913913
if ($(this.getAreaId('sidebar'))) {
914914
var data = {};
915915
if (this.collectElementsValue) {
916-
var elems = $(this.getAreaId('sidebar')).on('select', 'input');
916+
var elems = $(this.getAreaId('sidebar')).select('input');
917917
for (var i = 0; i < elems.length; i++) {
918918
if (elems[i].getValue()) {
919919
data[elems[i].name] = elems[i].getValue();
@@ -1005,7 +1005,7 @@ define([
10051005
var area = ['sidebar', 'items', 'shipping_method', 'billing_method', 'totals', 'giftmessage'];
10061006
// prepare additional fields
10071007
var fieldsPrepare = {update_items: 1};
1008-
var info = $('order-items_grid').on('select', 'input', 'select', 'textarea');
1008+
var info = $('order-items_grid').select('input', 'select', 'textarea');
10091009
for (var i = 0; i < info.length; i++) {
10101010
if (!info[i].disabled && (info[i].type != 'checkbox' || info[i].checked)) {
10111011
fieldsPrepare[info[i].name] = info[i].getValue();
@@ -1017,7 +1017,7 @@ define([
10171017
},
10181018

10191019
itemsOnchangeBind: function () {
1020-
var elems = $('order-items_grid').on('select', 'input', 'select', 'textarea');
1020+
var elems = $('order-items_grid').select('input', 'select', 'textarea');
10211021
for (var i = 0; i < elems.length; i++) {
10221022
if (!elems[i].bindOnchange) {
10231023
elems[i].bindOnchange = true;
@@ -1079,7 +1079,7 @@ define([
10791079
*/
10801080
showQuoteItemConfiguration: function (itemId) {
10811081
var listType = 'quote_items';
1082-
var qtyElement = $('order-items_grid').on('select', 'input[name="item\[' + itemId + '\]\[qty\]"]')[0];
1082+
var qtyElement = $('order-items_grid').select('input[name="item\[' + itemId + '\]\[qty\]"]')[0];
10831083
productConfigure.setConfirmCallback(listType, function () {
10841084
// sync qty of popup and qty of grid
10851085
var confirmedCurrentQty = productConfigure.getCurrentConfirmedQtyElement();
@@ -1102,7 +1102,7 @@ define([
11021102

11031103
accountFieldsBind: function (container) {
11041104
if ($(container)) {
1105-
var fields = $(container).on('select', 'input', 'select', 'textarea');
1105+
var fields = $(container).select('input', 'select', 'textarea');
11061106
for (var i = 0; i < fields.length; i++) {
11071107
if (fields[i].id == 'group_id') {
11081108
fields[i].observe('change', this.accountGroupChange.bind(this))
@@ -1123,7 +1123,7 @@ define([
11231123

11241124
commentFieldsBind: function (container) {
11251125
if ($(container)) {
1126-
var fields = $(container).on('select', 'input', 'textarea');
1126+
var fields = $(container).select('input', 'textarea');
11271127
for (var i = 0; i < fields.length; i++)
11281128
fields[i].observe('change', this.commentFieldChange.bind(this))
11291129
}
@@ -1135,7 +1135,7 @@ define([
11351135

11361136
giftmessageFieldsBind: function (container) {
11371137
if ($(container)) {
1138-
var fields = $(container).on('select', 'input', 'textarea');
1138+
var fields = $(container).select('input', 'textarea');
11391139
for (var i = 0; i < fields.length; i++)
11401140
fields[i].observe('change', this.giftmessageFieldChange.bind(this))
11411141
}
@@ -1148,7 +1148,7 @@ define([
11481148
giftmessageOnItemChange: function (event) {
11491149
var element = Event.element(event);
11501150
if (element.name.indexOf("giftmessage") != -1 && element.type == "checkbox" && !element.checked) {
1151-
var messages = $("order-giftmessage").on('select', 'textarea');
1151+
var messages = $("order-giftmessage").select('textarea');
11521152
var name;
11531153
for (var i = 0; i < messages.length; i++) {
11541154
name = messages[i].id.split("_");
@@ -1319,7 +1319,7 @@ define([
13191319
* @return {Object}
13201320
*/
13211321
serializeData: function (container) {
1322-
var fields = $(container).on('select', 'input', 'select', 'textarea'),
1322+
var fields = $(container).select('input', 'select', 'textarea'),
13231323
data = Form.serializeElements(fields, true);
13241324

13251325
return $H(data);

‎app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define(['prototype'], function () {
8787
},
8888

8989
checkAllItems: function (headCheckbox) {
90-
$(headCheckbox).up('table').on('select', 'tbody input[type="checkbox"]').each(function (checkbox) {
90+
$(headCheckbox).up('table').select('tbody input[type="checkbox"]').each(function (checkbox) {
9191
checkbox.checked = headCheckbox.checked;
9292
this._observeQty.call(checkbox);
9393
}.bind(this));
@@ -244,7 +244,7 @@ define(['prototype'], function () {
244244
},
245245

246246
validate: function () {
247-
var dimensionElements = $('packaging_window').on('select,
247+
var dimensionElements = $('packaging_window').select(
248248
'input[name=container_length],input[name=container_width],input[name=container_height],input[name=container_girth]:not("._disabled")'
249249
);
250250
var callback = null;
@@ -667,7 +667,7 @@ define(['prototype'], function () {
667667
return;
668668
}
669669

670-
$(currentNode).on( 'select',
670+
$(currentNode).select(
671671
'input[name=container_length],input[name=container_width],input[name=container_height],select[name=container_dimension_units]'
672672
).each(function (inputElement) {
673673
if (disable) {
@@ -686,8 +686,8 @@ define(['prototype'], function () {
686686

687687
changeContentTypes: function (obj) {
688688
var packageBlock = $(obj).up('[id^="package_block"]');
689-
var contentType = packageBlock.on('select', '[name=content_type]')[0];
690-
var contentTypeOther = packageBlock.on('select', '[name=content_type_other]')[0];
689+
var contentType = packageBlock.select('[name=content_type]')[0];
690+
var contentTypeOther = packageBlock.select('[name=content_type_other]')[0];
691691

692692
if (contentType.value == 'OTHER') {
693693
Form.Element.enable(contentTypeOther);
@@ -824,7 +824,7 @@ define(['prototype'], function () {
824824
this.itemsAll = itemsAll;
825825
}
826826

827-
packagePrepare.on('select', 'tbody input[type="checkbox"]').each(function (item) {
827+
packagePrepare.select('tbody input[type="checkbox"]').each(function (item) {
828828
$(item).observe('change', this._observeQty);
829829
this._observeQty.call(item);
830830
}.bind(this));

‎app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ define([
228228
* @this {iframe}
229229
*/
230230
iframeHandler = function () {
231-
var imageParams = JSON.parse($(this).contents().find('body').html()),
231+
var imageParams = $.parseJSON($(this).contents().find('body').html()),
232232
fullMediaUrl = imageParams['swatch_path'] + imageParams['file_path'];
233233

234234
localContainer.prev('input').val(imageParams['file_path']).trigger('change');

‎app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ define([
362362
* @this {iframe}
363363
*/
364364
iframeHandler = function () {
365-
var imageParams = JSON.parse($(this).contents().find('body').html()),
365+
var imageParams = $.parseJSON($(this).contents().find('body').html()),
366366
fullMediaUrl = imageParams['swatch_path'] + imageParams['file_path'];
367367

368368
container.prev('input').val(imageParams['file_path']);

‎lib/web/varien/js.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function decorateTable(table, options) {
167167
function decorateList(list, nonRecursive) {
168168
if ($(list)) {
169169
if (typeof nonRecursive == 'undefined') {
170-
var items = $(list).on('select', 'li');
170+
var items = $(list).select('li');
171171
} else {
172172
var items = $(list).childElements();
173173
}

0 commit comments

Comments
 (0)