Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update js/jquery.multi-select.js #41

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions js/jquery.multi-select.js
Expand Up @@ -49,8 +49,13 @@
optgroupLabel+'</li></ul></li>')); optgroupLabel+'</li></ul></li>'));
optgroupCpt++; optgroupCpt++;
} else { } else {

$(this).val($(this).val().split('"').join('&quot;'));
$(this).val($(this).val().split("'").join('&#39;'));
$(this).val($(this).val().replace(/"/gi,'&quot;'));

var klass = $(this).attr('class') ? ' '+$(this).attr('class') : ''; var klass = $(this).attr('class') ? ' '+$(this).attr('class') : '';
var selectableLi = $('<li class="ms-elem-selectable'+klass+'" ms-value="'+$(this).val()+'">'+$(this).text()+'</li>'); var selectableLi = $('<li class="ms-elem-selectable'+klass+'" ms-value="'+escapeQuotes($(this).val())+'">'+$(this).text()+'</li>');


if ($(this).attr('title')) if ($(this).attr('title'))
selectableLi.attr('title', $(this).attr('title')); selectableLi.attr('title', $(this).attr('title'));
Expand Down Expand Up @@ -178,13 +183,18 @@
$(this).multiSelect("init", $(this).data("settings")); $(this).multiSelect("init", $(this).data("settings"));
}, },
'select' : function(value, method){ 'select' : function(value, method){

value = value.split('"').join('&quot;');
value = value.split("'").join('&#39;');
value = value.replace(/"/gi,'&quot;');

var ms = this, var ms = this,
selectedOption = ms.find('option[value="'+value +'"]'), selectedOption = ms.find('option[value="'+value +'"]'),
text = selectedOption.text(), text = selectedOption.text(),
klass = selectedOption.attr('class'), klass = selectedOption.attr('class'),
titleAttr = selectedOption.attr('title'); titleAttr = selectedOption.attr('title');


var selectedLi = $('<li class="ms-elem-selected'+(klass ? ' '+klass : '')+'" ms-value="'+value+'">'+text+'</li>'), var selectedLi = $('<li class="ms-elem-selected'+(klass ? ' '+klass : '')+'" ms-value="'+escapeQuotes(value)+'">'+text+'</li>'),
selectableUl = $('#ms-'+ms.attr('id')+' .ms-selectable ul'), selectableUl = $('#ms-'+ms.attr('id')+' .ms-selectable ul'),
selectedUl = $('#ms-'+ms.attr('id')+' .ms-selection ul'), selectedUl = $('#ms-'+ms.attr('id')+' .ms-selection ul'),
selectableLi = selectableUl.children('li[ms-value="'+value+'"]'), selectableLi = selectableUl.children('li[ms-value="'+value+'"]'),
Expand All @@ -211,11 +221,11 @@
selectedLi.addClass(ms.data('settings').disabledClass); selectedLi.addClass(ms.data('settings').disabledClass);
} else { } else {
if(ms.data('settings').dblClick) { if(ms.data('settings').dblClick) {
selectableLi.dblclick(function(){ selectedLi.dblclick(function(){
ms.multiSelect('deselect', $(this).attr('ms-value')); ms.multiSelect('deselect', $(this).attr('ms-value'));
}); });
} else { } else {
selectableLi.click(function(){ selectedLi.click(function(){
ms.multiSelect('deselect', $(this).attr('ms-value')); ms.multiSelect('deselect', $(this).attr('ms-value'));
}); });
} }
Expand Down