summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlou <louiscuny@gmail.com>2012-11-29 14:43:32 +0100
committerlou <louiscuny@gmail.com>2012-11-29 14:43:32 +0100
commit8a56c3ad9f9f7e90b7dc9f6fbf99408abf7576db (patch)
tree0ee915d67d7c8ec5b09e2cce336d118b68df5a7f
parent096f0883a2272654037d920d845c04f1df73a1eb (diff)
downloadmulti-select-8a56c3ad9f9f7e90b7dc9f6fbf99408abf7576db.zip
multi-select-8a56c3ad9f9f7e90b7dc9f6fbf99408abf7576db.tar.gz
multi-select-8a56c3ad9f9f7e90b7dc9f6fbf99408abf7576db.tar.bz2
fix issue on selecting elems nested in optgoup
-rw-r--r--js/jquery.multi-select.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/jquery.multi-select.js b/js/jquery.multi-select.js
index d6491d2..9e3efb2 100644
--- a/js/jquery.multi-select.js
+++ b/js/jquery.multi-select.js
@@ -231,11 +231,11 @@
},
'select' : function(value, method){
var ms = this,
- selectableUl = $('#ms-'+ms.attr('id')+' .ms-selectable ul'),
- selectionUl = $('#ms-'+ms.attr('id')+' .ms-selection ul'),
+ selectableUl = $('#ms-'+ms.attr('id')+' .ms-selectable ul.ms-list'),
+ selectionUl = $('#ms-'+ms.attr('id')+' .ms-selection ul.ms-list'),
selectedOption = ms.find('option[value="'+value +'"]'),
- selectedLi = selectionUl.children('li[ms-value="'+value+'"]'),
- selectableLi = selectableUl.children('li[ms-value="'+value+'"]');
+ selectedLi = selectionUl.find('li[ms-value="'+value+'"]'),
+ selectableLi = selectableUl.find('li[ms-value="'+value+'"]');
if (method == 'init'){
haveToSelect = !selectableLi.hasClass(ms.data('settings').disabledClass) && selectedOption.prop('selected');
@@ -245,8 +245,8 @@
}
if (haveToSelect && selectedLi.is(':hidden')){
-
var selectableOptgroup = selectableLi.parent('.ms-optgroup');
+
if (selectableOptgroup.length > 0)
if (selectableOptgroup.children('.ms-elem-selectable:not(:hidden)').length == 1)
selectableOptgroup.children('.ms-optgroup-label').hide();