Permalink
Browse files

Adding prefix to 'collapse' for Twitter Bootstrap compatibility.

  • Loading branch information...
1 parent 86131cd commit 7be4a3eae3d5c844a8d063234d9453ce32c94f1f @chronon committed Apr 19, 2012
Showing with 8 additions and 8 deletions.
  1. +3 −3 css/multi-select.css
  2. +4 −4 js/application.js
  3. +1 −1 js/jquery.multi-select.js
View
@@ -32,7 +32,7 @@
width: 170px;
height: 200px;
padding: 1px 0px;
-
+
overflow-y: auto;
}
@@ -62,7 +62,7 @@
color: #999;
}
-.ms-container .ms-optgroup-label.collapse{
+.ms-container .ms-optgroup-label.ms-collapse{
background-image: url('../img/minus.png');
}
@@ -75,4 +75,4 @@
.ms-container .ms-selection li:not(.disabled):hover{
background: #eee url('../img/delete.png') no-repeat 3px 3px;
-}
+}
View
@@ -4,12 +4,12 @@
$('.multiselect').multiSelect({});
$('#ms-optgroup .ms-selectable, #ms-outsideCountries .ms-selectable').find('li.ms-elem-selectable').hide();
$('.ms-optgroup-label').click(function(){
- if ($(this).hasClass('collapse')){
+ if ($(this).hasClass('ms-collapse')){
$(this).nextAll('li').hide();
- $(this).removeClass('collapse');
+ $(this).removeClass('ms-collapse');
} else {
$(this).nextAll('li:not(.ms-selected)').show();
- $(this).addClass('collapse');
+ $(this).addClass('ms-collapse');
}
});
@@ -83,4 +83,4 @@
return false;
});
});
-})(jQuery)
+})(jQuery)
@@ -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');

0 comments on commit 7be4a3e

Please sign in to comment.