Skip to content

Commit cc47e01

Browse files
authored
MC-41903: Fix jQuery removeattr (#40)
* MC-41903: Fix jQuery removeattr * MC-41903: Fix removeAttr calls
1 parent 84a457b commit cc47e01

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

app/code/Magento/Checkout/view/frontend/web/js/region-updater.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ define([
192192
}
193193

194194
if (this.options.isRegionRequired) {
195-
regionList.addClass('required-entry').removeAttr('disabled');
195+
regionList.addClass('required-entry').prop('disabled', false);
196196
container.addClass('required').show();
197197
} else {
198198
regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
@@ -202,7 +202,7 @@ define([
202202
regionList.hide();
203203
container.hide();
204204
} else {
205-
regionList.removeAttr('disabled').show();
205+
regionList.prop('disabled', false).show();
206206
}
207207
}
208208

@@ -213,7 +213,7 @@ define([
213213
this._removeSelectOptions(regionList);
214214

215215
if (this.options.isRegionRequired) {
216-
regionInput.addClass('required-entry').removeAttr('disabled');
216+
regionInput.addClass('required-entry').prop('disabled', false);
217217
container.addClass('required').show();
218218
} else {
219219
if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
@@ -238,7 +238,7 @@ define([
238238

239239
// Add defaultvalue attribute to state/province select element
240240
regionList.attr('defaultvalue', this.options.defaultRegion);
241-
this.options.form.find('[type="submit"]').removeAttr('disabled').show();
241+
this.options.form.find('[type="submit"]').prop('disabled', false).show();
242242
},
243243

244244
/**

app/code/Magento/Eav/view/adminhtml/web/js/input-types.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ define([
7171
// Check current type (allow only compatible types)
7272
if (~enabledTypes.indexOf(currentValue)) {
7373
// Enable select and keep only available options (all other will be removed)
74-
select.removeAttr('disabled').find('option').each(removeOption);
74+
select.prop('disabled', false).find('option').each(removeOption);
7575
// Add warning on page and event for show/hide it
7676
select.after(warning).on('change', toggleWarning);
7777
}

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ define([
192192
}
193193

194194
this.selectedFolder(folderId);
195-
$(this.deleteButtonSelector).removeAttr('disabled').removeClass('disabled');
195+
$(this.deleteButtonSelector).prop('disabled', false).removeClass('disabled');
196196
}
197197
});
198198
});

app/code/Magento/Paypal/view/adminhtml/web/js/rules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ define([
161161
var solutionConfiguration = solution.find(buttonConfiguration);
162162

163163
unlock || typeof unlock === 'undefined' ?
164-
solutionConfiguration.removeClass('disabled').removeAttr('disabled') :
164+
solutionConfiguration.removeClass('disabled').prop('disabled', false) :
165165
solutionConfiguration.addClass('disabled').attr('disabled', 'disabled');
166166
},
167167

app/code/Magento/Paypal/view/adminhtml/web/js/solutions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ define([
7575
*/
7676
wipeButtonsConfiguration: function () {
7777
$(this.buttonConfiguration).removeClass('disabled')
78-
.removeAttr('disabled');
78+
.prop('disabled', false);
7979
},
8080

8181
/**

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,12 @@ define([
332332
},
333333

334334
/**
335-
* @param {Object} el
335+
* @param {jQuery} el
336336
* @this {swatchProductAttributes}
337337
*/
338338
_enable: function (el) {
339339
if (!el.attr('readonly')) {
340-
el.removeAttr('disabled');
340+
el.prop('disabled', false);
341341
}
342342
},
343343

app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,9 @@ define([
879879
* @private
880880
*/
881881
_Rewind: function (controls) {
882-
controls.find('div[data-option-id], option[data-option-id]').removeClass('disabled').removeAttr('disabled');
882+
controls.find('div[data-option-id], option[data-option-id]')
883+
.removeClass('disabled')
884+
.prop('disabled', false);
883885
controls.find('div[data-option-empty], option[data-option-empty]')
884886
.attr('disabled', true)
885887
.addClass('disabled')

0 commit comments

Comments
 (0)