Merge branch 'jquery-upgrade' of github.com:magento-lynx/magento2ce i…

…nto MC-42049_fix_keydown_and_keyup
magento · May 25, 2021 · 86b6db8 · 86b6db8
2 parents dc9ff50 + cc47e01
commit 86b6db8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -192,7 +192,7 @@ define([
                 }
 
                 if (this.options.isRegionRequired) {
-                    regionList.addClass('required-entry').removeAttr('disabled');
+                    regionList.addClass('required-entry').prop('disabled', false);
                     container.addClass('required').show();
                 } else {
                     regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
@@ -202,7 +202,7 @@ define([
                         regionList.hide();
                         container.hide();
                     } else {
-                        regionList.removeAttr('disabled').show();
+                        regionList.prop('disabled', false).show();
                     }
                 }
 
@@ -213,7 +213,7 @@ define([
                 this._removeSelectOptions(regionList);
 
                 if (this.options.isRegionRequired) {
-                    regionInput.addClass('required-entry').removeAttr('disabled');
+                    regionInput.addClass('required-entry').prop('disabled', false);
                     container.addClass('required').show();
                 } else {
                     if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
@@ -238,7 +238,7 @@ define([
 
             // Add defaultvalue attribute to state/province select element
             regionList.attr('defaultvalue', this.options.defaultRegion);
-            this.options.form.find('[type="submit"]').removeAttr('disabled').show();
+            this.options.form.find('[type="submit"]').prop('disabled', false).show();
         },
 
         /**

diff --git a/app/code/Magento/Eav/view/adminhtml/web/js/input-types.js b/app/code/Magento/Eav/view/adminhtml/web/js/input-types.js
@@ -71,7 +71,7 @@ define([
             // Check current type (allow only compatible types)
             if (~enabledTypes.indexOf(currentValue)) {
                 // Enable select and keep only available options (all other will be removed)
-                select.removeAttr('disabled').find('option').each(removeOption);
+                select.prop('disabled', false).find('option').each(removeOption);
                 // Add warning on page and event for show/hide it
                 select.after(warning).on('change', toggleWarning);
             }

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
@@ -192,7 +192,7 @@ define([
             }
 
             this.selectedFolder(folderId);
-            $(this.deleteButtonSelector).removeAttr('disabled').removeClass('disabled');
+            $(this.deleteButtonSelector).prop('disabled', false).removeClass('disabled');
         }
     });
 });
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
@@ -161,7 +161,7 @@ define([
             var solutionConfiguration = solution.find(buttonConfiguration);
 
             unlock || typeof unlock === 'undefined' ?
-                solutionConfiguration.removeClass('disabled').removeAttr('disabled') :
+                solutionConfiguration.removeClass('disabled').prop('disabled', false) :
                 solutionConfiguration.addClass('disabled').attr('disabled', 'disabled');
         },
 

diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solutions.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solutions.js
@@ -75,7 +75,7 @@ define([
          */
         wipeButtonsConfiguration: function () {
             $(this.buttonConfiguration).removeClass('disabled')
-                .removeAttr('disabled');
+                .prop('disabled', false);
         },
 
         /**

diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
@@ -332,12 +332,12 @@ define([
                 },
 
                 /**
-                 * @param {Object} el
+                 * @param {jQuery} el
                  * @this {swatchProductAttributes}
                  */
                 _enable: function (el) {
                     if (!el.attr('readonly')) {
-                        el.removeAttr('disabled');
+                        el.prop('disabled', false);
                     }
                 },
 

diff --git a/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
@@ -879,7 +879,9 @@ define([
          * @private
          */
         _Rewind: function (controls) {
-            controls.find('div[data-option-id], option[data-option-id]').removeClass('disabled').removeAttr('disabled');
+            controls.find('div[data-option-id], option[data-option-id]')
+                .removeClass('disabled')
+                .prop('disabled', false);
             controls.find('div[data-option-empty], option[data-option-empty]')
                 .attr('disabled', true)
                 .addClass('disabled')