Skip to content

Commit 0f31754

Browse files
committed
AC-105: Update Third Party library: jquery-editable(editableMultiselect)
- Update jquery-multiselect to use props when appropriate
1 parent 9cdf4ae commit 0f31754

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

lib/web/jquery/editableMultiselect/js/jquery.multiselect.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ define([
7878

7979
str += o.item
8080
.replace(/%value%/gi, option.val())
81-
.replace(/%checked%/gi, option.attr('selected') ? 'checked' : '')
82-
.replace(/%mselectCheckedClass%/gi, option.attr('selected') ? ''+o.mselectCheckedClass+'' : '')
83-
.replace(/%disabled%/gi, option.attr('disabled') ? 'disabled' : '')
84-
.replace(/%mselectDisabledClass%/gi, option.attr('disabled') ? ''+o.mselectDisabledClass+'' : '')
81+
.replace(/%checked%/gi, option.prop('selected') ? 'checked' : '')
82+
.replace(/%mselectCheckedClass%/gi, option.prop('selected') ? ''+o.mselectCheckedClass+'' : '')
83+
.replace(/%disabled%/gi, option.prop('disabled') ? 'disabled' : '')
84+
.replace(/%mselectDisabledClass%/gi, option.prop('disabled') ? ''+o.mselectDisabledClass+'' : '')
8585
.replace(/%mselectListItemClass%/gi, o.mselectListItemClass)
8686
.replace(/%iseditable%/gi, option.attr('data-is-editable') ? ''+o.mselectItemNotEditableClass+'' : '')
8787
.replace(/%isremovable%/i, option.attr('data-is-removable') ? ''+o.mselectItemNotRemovableClass+'' : '')
@@ -108,7 +108,7 @@ define([
108108
var checkbox = $(this),
109109
index = checkbox.closest('.' + o.mselectListItemClass + '').index();
110110

111-
select.find('option').eq(index).attr('selected', !!checkbox.attr('checked'));
111+
select.find('option').eq(index).prop('selected', !!checkbox.prop('checked'));
112112
}),
113113
list = widget.find('.' + o.mselectItemsWrapperClass + ''),
114114
buttonAdd = widget.find('.' + o.mselectButtonAddClass + '')
@@ -157,8 +157,8 @@ define([
157157
.replace(/%mselectDisabledClass%|%iseditable%|%isremovable%/gi,'')
158158
.replace(/%mselectListItemClass%/gi,o.mselectListItemClass))
159159
.find('[type=checkbox]')
160-
.attr('checked', true)
161160
.addClass(o.mselectCheckedClass)
161+
.prop('checked', true)
162162
.end();
163163

164164
list.children('.' + o.mselectListItemClass + '').length

lib/web/mage/backend/editablemultiselect.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,12 @@ define([
267267
resultEntityValueName + '</option>');
268268
// Add editable multiselect item
269269
mselectItemHtml = $(options.item.replace(/%value%|%label%/gi, resultEntityValueName)
270-
.replace(/%mselectDisabledClass%|%iseditable%|%isremovable%/gi, '')
271-
.replace(/%mselectListItemClass%/gi, options.mselectListItemClass))
272-
.find('[type=checkbox]')
273-
.attr('checked', true)
274-
.addClass(options.mselectCheckedClass)
275-
.end();
270+
.replace(/%mselectDisabledClass%|%iseditable%|%isremovable%/gi, '')
271+
.replace(/%mselectListItemClass%/gi, options.mselectListItemClass))
272+
.find('[type=checkbox]')
273+
.addClass(options.mselectCheckedClass)
274+
.prop('checked', true)
275+
.end();
276276
sectionBlock = select.nextAll('section.block:first');
277277
itemsWrapper = sectionBlock.find('.' + options.mselectItemsWrapperClass + '');
278278

0 commit comments

Comments
 (0)