Skip to content

Commit

Permalink
Merge branch '2.4-develop' into AC-1260-upgrade-npm-dependencies-to-t…
Browse files Browse the repository at this point in the history
…he-latest-versions
  • Loading branch information
Andrii Beziazychnyi authored Feb 7, 2022
2 parents a24d621 + 76e5a67 commit aed8004
Show file tree
Hide file tree
Showing 44 changed files with 48 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/*global define*/
/*global FORM_KEY*/
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/*global define*/
/*global FORM_KEY*/
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

/*global FORM_KEY*/
/*global bSelection*/
/*global $H*/
/**
* @api
*/
Expand Down Expand Up @@ -186,7 +185,9 @@ define([
});
bSelection.gridRemoval.each(function (pair) {
$optionBox.find('.col-sku').filter(function () {
return $(this).text().trim() === pair.key; // find row by SKU
let text = $(this).text();

return text.trim() === pair.key; // find row by SKU
}).closest('tr').find('button.delete').trigger('click');
});
widget.refreshSortableElements();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/*global alert*/
define([
'jquery',
'ko',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/*global alert:true*/
define([
'jquery',
'mage/template',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* See COPYING.txt for license details.
*/

/* global $, $H */

define([
'mage/adminhtml/grid'
], function () {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/view/base/web/js/price-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ define([
* @return {String}
*/
function stringPad(string, times) {
return (new Array(times + 1)).join(string);
return new Array(times + 1).join(string);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/*global alert*/
define([
'jquery'
], function ($) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/*global alert*/

define([
'jquery',
'mage/utils/wrapper',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ define([
product.id = element.val();
product.qty = 0;
element.closest('[data-role=row]').find('[data-column]').each(function (index, el) {
product[$(el).data('column')] = $(el).text().trim();
let text = $(el).text();

product[$(el).data('column')] = text.trim();
});
selectedProductList[product.id] = product;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ define([
try {
// Get integration name either from current element or from neighbor column
integrationName = $(ctx).attr('data-row-name') ||
$(ctx).parents('tr').find('.col-name').html().trim();
$(ctx).parents('tr').find('.col-name').html().trim(); // eslint-disable-line jquery-no-trim

if (integrationName.indexOf('<span') > -1) {
// Remove unsecure URL warning from popup window title if it is present
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ define([

delay = delay || this.messageDelay;

// eslint-disable-next-line no-unused-vars
timerId = setTimeout(function () {
clearTimeout(timerId);
this.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/
/*browser:true*/
/*global define*/

define([
'jquery',
'uiComponent'
Expand Down
8 changes: 6 additions & 2 deletions app/code/Magento/Paypal/view/frontend/web/js/order-review.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ define([
isChecked = $(this.options.billingAsShippingSelector).is(':checked');
formData = null;
callBackResponseHandler = null;
shippingMethod = $(this.options.shippingSelector).val().trim();
let val = $(this.options.shippingSelector).val();

shippingMethod = val.trim();
this._shippingTobilling();

if (url && resultId && shippingMethod) {
Expand Down Expand Up @@ -358,7 +360,9 @@ define([
* Actions on change Shipping Address data
*/
_onShippingChange: function () {
if (this.triggerPropertyChange && $(this.options.shippingSelector).val().trim()) {
let val = $(this.options.shippingSelector).val();

if (this.triggerPropertyChange && val.trim()) {
this.element.find(this.options.shippingSelector).hide().end()
.find(this.options.shippingSelector + '_update').show();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ define([
* @private
*/
_formatVimeoDuration: function (seconds) {
return (new Date(seconds * 1000)).toUTCString().match(/(\d\d:\d\d:\d\d)/)[0];
return new Date(seconds * 1000).toUTCString().match(/(\d\d:\d\d:\d\d)/)[0];
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ define([
$inputEl.on('blur', function () {
var inputVal = parseInt($inputEl.val(), 10);

if (256000 > inputVal) {
if (inputVal < 256000) {
confirm({
title: $t(config.modalTitleText),
content: $t(config.modalContentBody),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/

/* global $break $ FORM_KEY */
/* global FORM_KEY */

/**
* @api
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Swatches/view/adminhtml/web/js/text.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* See COPYING.txt for license details.
*/

/* global $break $ $$ */

/**
* @api
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Swatches/view/adminhtml/web/js/visual.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/

/* global $break $ $$ FORM_KEY */
/* global FORM_KEY */

/**
* @api
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Ui/view/base/web/js/lib/core/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/* global WeakMap, Map*/
define([
'ko',
'underscore'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ define([
* @returns {Array}
*/
function strPad(string, times) {
return (new Array(times + 1)).join(string);
return new Array(times + 1).join(string);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/* global WeakMap */
define([
'ko',
'underscore',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/**
* @api
*/
/* global WeakMap */
define([
'jquery',
'underscore'
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/

/* global WeakMap */
define([], function () {
'use strict';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ define([
}

if (typeof elem.validate === 'function') {
this.valid = this.valid & elem.validate().valid;
this.valid &= elem.validate().valid;
} else if (elem.elems) {
elem.elems().forEach(this.validate, this);
}
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Vault/view/adminhtml/web/js/vault.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* See COPYING.txt for license details.
*/
/*browser:true*/
/*global define*/
/* @api */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/
/*browser:true*/
/*global define*/

define(
[
'Magento_Checkout/js/view/payment/default',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/
/*browser:true*/
/*global define*/

/* @api */
define(
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* See COPYING.txt for license details.
*/
/*browser:true*/
/*global define*/

/* @api */
define([
'underscore',
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/* global jQuery */

/* eslint-disable max-nested-callbacks */
define([
'jquery',
Expand Down
Loading

0 comments on commit aed8004

Please sign in to comment.