From cc47e01964ea9e74f53892971c3fa0ac30732158 Mon Sep 17 00:00:00 2001 From: Sergio Vera Date: Tue, 25 May 2021 16:13:04 +0200 Subject: [PATCH] MC-41903: Fix jQuery removeattr (#40) * MC-41903: Fix jQuery removeattr * MC-41903: Fix removeAttr calls --- .../Checkout/view/frontend/web/js/region-updater.js | 8 ++++---- app/code/Magento/Eav/view/adminhtml/web/js/input-types.js | 2 +- .../view/adminhtml/web/js/directory/directories.js | 2 +- app/code/Magento/Paypal/view/adminhtml/web/js/rules.js | 2 +- .../Magento/Paypal/view/adminhtml/web/js/solutions.js | 2 +- .../Swatches/view/adminhtml/web/js/product-attributes.js | 4 ++-- .../Magento/Swatches/view/base/web/js/swatch-renderer.js | 4 +++- 7 files changed, 13 insertions(+), 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 index f50332c9012aa..4307acea96e21 100644 --- 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 index 250bea09adf4b..c4a0e84cf7d69 100644 --- 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 index 5555baeabb66a..3f195332cc991 100644 --- 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 index 555d2a80a8610..4a8b5272a7245 100644 --- 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 index d6efcae9cfc92..95e794e39b269 100644 --- 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 index c4fdd7169b944..fc041c39f29e1 100644 --- 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 index d8030fc3e29f4..d5dbaf28e219b 100644 --- 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')