Skip to content

Commit e7a06d3

Browse files
jcuerdosivaschenko
andauthored
MC-42052: Fix jQuery.fn.click() (#47)
* MC-42052: Fix jQuery.fn.click() * MC-42052: Replace jQuery click shorthand function Co-authored-by: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
1 parent 7f7b3d1 commit e7a06d3

File tree

22 files changed

+33
-33
lines changed

22 files changed

+33
-33
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ define([
7979
}
8080
});
8181

82-
$('#store-change-button').click();
82+
$('#store-change-button').trigger('click');
8383
}
8484
}
8585

app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define([
1111
'use strict';
1212

1313
return function (config, element) {
14-
$(element).click(function (event) {
14+
$(element).on('click', function (event) {
1515
var cart = customerData.get('cart'),
1616
customer = customerData.get('customer');
1717

app/code/Magento/Customer/view/adminhtml/web/edit/post-wrapper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ define([
2525
}));
2626
}
2727

28-
$('#customer-edit-delete-button').click(function () {
28+
$('#customer-edit-delete-button').on('click', function () {
2929
var msg = $.mage.__('Are you sure you want to do this?'),
3030
url = $('#customer-edit-delete-button').data('url');
3131

app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ define([
4949
.find('.giftmessage-area:not(:visible)').each(function (x, element) {
5050
if ($(element).val().length > 0) {
5151
$(element).trigger('change');
52-
container.find('a').click();
52+
container.find('a').trigger('click');
5353
}
5454
});
5555
} else {
@@ -61,7 +61,7 @@ define([
6161
}).end()
6262
.find('.giftmessage-area').val('').change().end()
6363
.find('.select').val('').change().end()
64-
.find('.checkbox:checked').prop('checked', false).click().prop('checked', false).end()
64+
.find('.checkbox:checked').prop('checked', false).trigger('click').prop('checked', false).end()
6565
.find('.price-box').addClass(this.options.noDisplay).end();
6666
}
6767
},

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ define([
304304
* Action to close the context menu in media gallery.
305305
*/
306306
closeContextMenu: function () {
307-
$(this.gridSelector).click();
307+
$(this.gridSelector).trigger('click');
308308
},
309309

310310
/**

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ define([
7272
* Initialize image action events
7373
*/
7474
initEvents: function () {
75-
$(this.imageModel().addSelectedBtnSelector).click(function () {
75+
$(this.imageModel().addSelectedBtnSelector).on('click', function () {
7676
image.insertImage(
7777
this.imageModel().getSelected(),
7878
{
@@ -81,7 +81,7 @@ define([
8181
}
8282
);
8383
}.bind(this));
84-
$(this.imageModel().deleteSelectedBtnSelector).click(function () {
84+
$(this.imageModel().deleteSelectedBtnSelector).on('click', function () {
8585
this.deleteImageAction(this.imageModel().selected());
8686
}.bind(this));
8787

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ define([
219219

220220
if (key === 'enterKey') {
221221
event.preventDefault();
222-
modalElement.find('.page-action-buttons button.save').click();
222+
modalElement.find('.page-action-buttons button.save').trigger('click');
223223
}
224224

225225
return true;

app/code/Magento/Msrp/view/base/web/js/msrp.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ define([
172172
ev.preventDefault();
173173

174174
if (this.options.addToCartButton) {
175-
$(this.options.addToCartButton).click();
175+
$(this.options.addToCartButton).trigger('click');
176176
this.closePopup(this.$popup);
177177
}
178178
},
@@ -199,7 +199,7 @@ define([
199199
this.options.inputQty && !isNaN(this.tierOptions.qty)
200200
) {
201201
$(this.options.inputQty).val(this.tierOptions.qty);
202-
$(this.options.addToCartButton).click();
202+
$(this.options.addToCartButton).trigger('click');
203203
this.closePopup(this.$popup);
204204
}
205205
},
@@ -280,7 +280,7 @@ define([
280280
}
281281

282282
if (this.options.addToCartButton) {
283-
$(this.options.addToCartButton).click();
283+
$(this.options.addToCartButton).trigger('click');
284284

285285
return false;
286286
}

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ define([
602602
}
603603

604604
if (this.isFullscreen && this.fotoramaItem.data('fotorama').activeFrame.i === number) {
605-
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].click();
605+
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
606606
}
607607
},
608608

@@ -748,14 +748,14 @@ define([
748748
if (window.Froogaloop) {
749749
clearInterval(waitForFroogaloop);
750750
fotorama.requestFullScreen();
751-
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].click();
751+
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
752752
this.Base = false;
753753
}
754754
}, this), 50);
755755
} else { //if not a vimeo - play it immediately with a little lag in case for fotorama fullscreen
756756
setTimeout($.proxy(function () {
757757
fotorama.requestFullScreen();
758-
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].click();
758+
this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
759759
this.Base = false;
760760
}, this), 50);
761761
}

app/code/Magento/Review/view/frontend/web/js/process-reviews.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define([
2222
}).done(function (data) {
2323
$('#product-review-container').html(data).trigger('contentUpdated');
2424
$('[data-role="product-review"] .pages a').each(function (index, element) {
25-
$(element).click(function (event) { //eslint-disable-line max-nested-callbacks
25+
$(element).on('click', function (event) { //eslint-disable-line max-nested-callbacks
2626
processReviews($(element).attr('href'), true);
2727
event.preventDefault();
2828
});
@@ -49,7 +49,7 @@ define([
4949
}
5050

5151
$(function () {
52-
$('.product-info-main .reviews-actions a').click(function (event) {
52+
$('.product-info-main .reviews-actions a').on('click', function (event) {
5353
var anchor, addReviewBlock;
5454

5555
event.preventDefault();

app/code/Magento/Sales/view/adminhtml/web/order/view/post-wrapper.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ define([
2525
}));
2626
}
2727

28-
$('#order-view-cancel-button').click(function () {
28+
$('#order-view-cancel-button').on('click', function () {
2929
var msg = $.mage.__('Are you sure you want to cancel this order?'),
3030
url = $('#order-view-cancel-button').data('url');
3131

@@ -45,13 +45,13 @@ define([
4545
return false;
4646
});
4747

48-
$('#order-view-hold-button').click(function () {
48+
$('#order-view-hold-button').on('click', function () {
4949
var url = $('#order-view-hold-button').data('url');
5050

5151
getForm(url).appendTo('body').trigger('submit');
5252
});
5353

54-
$('#order-view-unhold-button').click(function () {
54+
$('#order-view-unhold-button').on('click', function () {
5555
var url = $('#order-view-unhold-button').data('url');
5656

5757
getForm(url).appendTo('body').trigger('submit');

app/code/Magento/Security/view/adminhtml/web/js/confirm-redirect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define(
99
'use strict';
1010

1111
return function (config, element) {
12-
$(element).click(config, function () {
12+
$(element).on('click', config, function () {
1313
confirmSetLocation(config.message, config.url);
1414
});
1515
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ define([
250250
*/
251251
$(container).on('click', '.btn_choose_file_upload', function () {
252252
swatchComponents.inputFile.attr('data-called-by', $(this).data('class'));
253-
swatchComponents.inputFile.click();
253+
swatchComponents.inputFile.trigger('click');
254254
});
255255

256256
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ define([
384384
*/
385385
$(document).on('click', '.btn_choose_file_upload', function () {
386386
swatchComponents.inputFile.attr('data-called-by', $(this).attr('id'));
387-
swatchComponents.inputFile.click();
387+
swatchComponents.inputFile.trigger('click');
388388
});
389389

390390
/**

app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ define([
133133
* @param {Event} e
134134
*/
135135
triggerImageUpload: function (imageUploader, e) {
136-
$(e.target).closest('.file-uploader').find('input[type="file"]').click();
136+
$(e.target).closest('.file-uploader').find('input[type="file"]').trigger('click');
137137
},
138138

139139
/**

dev/tests/js/jasmine/tests/app/code/Magento/Msrp/frontend/js/msrp.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ define([
4141
expect(result).toEqual(wdContainer[0]);
4242
done();
4343
});
44-
link.click();
44+
link.trigger('click');
4545
});
4646
});
4747
});

dev/tests/js/jasmine/tests/app/code/Magento/Multishipping/frontend/js/multi-shipping.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ define([
100100
it('Check add new address event', function () {
101101
Obj = new MultiShipping({});
102102
Obj.element = jasmine.createSpyObj('element', ['submit']);
103-
addNewAddressBtn.click();
103+
addNewAddressBtn.trigger('click');
104104

105105
expect(Obj.element.submit).toHaveBeenCalled();
106106
expect(addressflag.val()).toBe('1');
@@ -109,7 +109,7 @@ define([
109109
it('Check can continue event', function () {
110110
Obj = new MultiShipping({});
111111
Obj.element = jasmine.createSpyObj('element', ['submit']);
112-
canContinueBtn.click();
112+
canContinueBtn.trigger('click');
113113

114114
expect(Obj.element.submit).not.toHaveBeenCalled();
115115
expect(canContinueFlag.val()).toBe('1');

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/prompt.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define([
3838
it('Check cancel action', function () {
3939
var cancel = spyOn(widget.options.actions, 'cancel');
4040

41-
jQuery('.modals-overlay').click();
41+
jQuery('.modals-overlay').trigger('click');
4242
expect(widget.options.outerClickHandler).toBeDefined();
4343
expect(cancel).toHaveBeenCalled();
4444
});

dev/tests/js/jasmine/tests/lib/mage/multiselect.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ define([
145145

146146
spyOn(instance.data('mage-multiselect2'), '_createSelectedOption').and.returnValue(true);
147147

148-
checkbox.click();
148+
checkbox.trigger('click');
149149

150150
expect(instance.data('mage-multiselect2')._createSelectedOption).toHaveBeenCalledWith({
151151
value: '1',

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/rules/jquery/jquery-no-click-event-shorthand.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = {
1111
create: function(context) {
1212
return {
1313
CallExpression: function(node) {
14-
let names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown', 'mouseup', 'mousemove', 'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select', 'submit', 'keydown', 'keypress', 'keyup', 'contextmenu'],
14+
let names = ['blur', 'focus', 'focusin', 'focusout', 'resize', 'scroll', 'dblclick', 'mousedown', 'mouseup', 'mousemove', 'mouseover', 'mouseout', 'mouseenter', 'mouseleave', 'change', 'select', 'submit', 'keydown', 'keypress', 'keyup', 'contextmenu', 'click'],
1515
name
1616
if (node.callee.type !== 'MemberExpression') return
1717
if (!names.includes(node.callee.property.name)) return

lib/web/mage/adminhtml/browser.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ define([
235235
contentBlock.html(data).trigger('contentUpdated');
236236

237237
if (uploaded) {
238-
contentBlock.find('.filecnt:last').click();
238+
contentBlock.find('.filecnt:last').trigger('click');
239239
}
240240
});
241241
},
@@ -244,7 +244,7 @@ define([
244244
* @param {jQuery.Event} event
245245
*/
246246
selectFolder: function (event) {
247-
this.element.find('[data-id="' + $(event.currentTarget).data('node').id + '"]>a').click();
247+
this.element.find('[data-id="' + $(event.currentTarget).data('node').id + '"]>a').trigger('click');
248248
},
249249

250250
/**

lib/web/mage/terms.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ define([
104104
}
105105
}
106106
$(switches).each(function (ind, el) {
107-
$(el).click(function (event) {
107+
$(el).on('click', function (event) {
108108
event.preventDefault();
109109
showItem(ind);
110110
});

0 commit comments

Comments
 (0)