Merge pull request #27 from chronon/master

The class .collapse creates a conflict with Twitter Bootstrap

2 files changed, 5 insertions, 5 deletions

diff --git a/js/application.js b/js/application.js
index c61af77..7f58e45 100644
--- a/js/application.js
+++ b/js/application.js
@@ -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)
\ No newline at end of file
+})(jQuery)
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');