summaryrefslogtreecommitdiffstats
path: root/js/jquery.multi-select.js
diff options
context:
space:
mode:
authorlouis cuny <louiscuny@gmail.com>2012-04-20 01:05:21 -0700
committerlouis cuny <louiscuny@gmail.com>2012-04-20 01:05:21 -0700
commitf14b03196db678a266e4657091f33b60c30883eb (patch)
tree9a34fd027d8497dc2d28129d9231e1007427840f /js/jquery.multi-select.js
parent86131cd20d8291bba5852089dbc1be57c0bc1883 (diff)
parent7be4a3eae3d5c844a8d063234d9453ce32c94f1f (diff)
downloadmulti-select-f14b03196db678a266e4657091f33b60c30883eb.zip
multi-select-f14b03196db678a266e4657091f33b60c30883eb.tar.gz
multi-select-f14b03196db678a266e4657091f33b60c30883eb.tar.bz2
Merge pull request #27 from chronon/master
The class .collapse creates a conflict with Twitter Bootstrap
Diffstat (limited to 'js/jquery.multi-select.js')
-rw-r--r--js/jquery.multi-select.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/jquery.multi-select.js b/js/jquery.multi-select.js
index 56695de..0ec72e1 100644
--- a/js/jquery.multi-select.js
+++ b/js/jquery.multi-select.js
@@ -184,7 +184,7 @@
var parentOptgroup = selectableLi.parent('.ms-optgroup');
if (parentOptgroup.length > 0){
- parentOptgroup.children('.ms-optgroup-label').addClass('collapse').show();
+ parentOptgroup.children('.ms-optgroup-label').addClass('ms-collapse').show();
parentOptgroup.children('.ms-elem-selectable:not(.ms-selected)').show();
}
selectedOption.removeAttr('selected');