Merge branch 'magento-commerce:2.4-develop' into L3-PR-20220202

ArtemVasyliev · web-flow · commit d3e69242b487 · 2022-02-07T09:02:37.000-06:00
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js b/app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js b/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js
@@ -5,7 +5,6 @@
 
 /*global FORM_KEY*/
 /*global bSelection*/
-/*global $H*/
 /**
  * @api
  */
@@ -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();
diff --git a/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert*/
 define([
     'jquery',
     'ko',
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert:true*/
 define([
     'jquery',
     'mage/template',
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/assign-products.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/assign-products.js
@@ -3,8 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global $, $H */
-
 define([
     'mage/adminhtml/grid'
 ], function () {
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
@@ -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);
     }
 
     /**
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreements-assigner.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreements-assigner.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert*/
 define([
     'jquery'
 ], function ($) {
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/set-payment-information-mixin.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/set-payment-information-mixin.js
@@ -2,7 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*global alert*/
+
 define([
     'jquery',
     'mage/utils/wrapper',
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js
@@ -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 {
diff --git a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
@@ -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
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
@@ -70,6 +70,7 @@ define([
 
             delay = delay || this.messageDelay;
 
+            // eslint-disable-next-line no-unused-vars
             timerId = setTimeout(function () {
                 clearTimeout(timerId);
                 this.clear();
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/payflowpro/vault.js b/app/code/Magento/Paypal/view/adminhtml/web/js/payflowpro/vault.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 /*browser:true*/
-/*global define*/
+
 define([
     'jquery',
     'uiComponent'
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
@@ -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) {
@@ -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();
             }
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -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];
             },
 
             /**
diff --git a/app/code/Magento/Security/view/adminhtml/web/js/system/config/session-size.js b/app/code/Magento/Security/view/adminhtml/web/js/system/config/session-size.js
@@ -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),
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 
-/* global $break $ FORM_KEY */
+/* global FORM_KEY */
 
 /**
  * @api
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/text.js b/app/code/Magento/Swatches/view/adminhtml/web/js/text.js
@@ -3,8 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global $break $ $$ */
-
 /**
  *  @api
  */
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/visual.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 
-/* global $break $ $$ FORM_KEY */
+/* global FORM_KEY */
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/events.js b/app/code/Magento/Ui/view/base/web/js/lib/core/events.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global WeakMap, Map*/
 define([
     'ko',
     'underscore'
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js
@@ -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);
             }
 
             /**
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global WeakMap */
 define([
     'ko',
     'underscore',
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js b/app/code/Magento/Ui/view/base/web/js/lib/registry/registry.js
@@ -6,7 +6,6 @@
 /**
  * @api
  */
-/* global WeakMap */
 define([
     'jquery',
     'underscore'
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global WeakMap */
 define([], function () {
     'use strict';
 
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js b/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js
@@ -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);
             }
diff --git a/app/code/Magento/Vault/view/adminhtml/web/js/vault.js b/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 /*browser:true*/
-/*global define*/
 /* @api */
 define([
     'jquery',
diff --git a/app/code/Magento/Vault/view/frontend/web/js/view/payment/method-renderer/vault.js b/app/code/Magento/Vault/view/frontend/web/js/view/payment/method-renderer/vault.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 /*browser:true*/
-/*global define*/
+
 define(
     [
         'Magento_Checkout/js/view/payment/default',
diff --git a/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault-enabler.js b/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault-enabler.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 /*browser:true*/
-/*global define*/
+
 /* @api */
 define(
     [
diff --git a/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js b/app/code/Magento/Vault/view/frontend/web/js/view/payment/vault.js
@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 /*browser:true*/
-/*global define*/
+
 /* @api */
 define([
     'underscore',
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
@@ -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',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
@@ -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',
diff --git a/lib/web/mage/adminhtml/grid.js b/lib/web/mage/adminhtml/grid.js
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
diff --git a/lib/web/mage/backend/tabs.js b/lib/web/mage/backend/tabs.js
diff --git a/lib/web/mage/requirejs/text.js b/lib/web/mage/requirejs/text.js
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
diff --git a/package.json.sample b/package.json.sample

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ define([`
`27`	`27`	`* @return {String}`
`28`	`28`	`*/`
`29`	`29`	`function stringPad(string, times) {`
`30`		`- return (new Array(times + 1)).join(string);`
	`30`	`+ return new Array(times + 1).join(string);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`