summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--js/application.js2
-rw-r--r--js/jquery.multi-select.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/js/application.js b/js/application.js
index fb9b7ec..173626a 100644
--- a/js/application.js
+++ b/js/application.js
@@ -2,7 +2,7 @@
$(function(){
$('.multiselect').multiSelect({});
- $('#ms-optgroup .ms-selectable').find('li.ms-elem-selectable').hide();
+ $('#ms-optgroup .ms-selectable, #ms-outsideCountries .ms-selectable').find('li.ms-elem-selectable').hide();
$('.ms-optgroup-label').click(function(){
if ($(this).hasClass('collapse')){
$(this).nextAll('li').hide();
diff --git a/js/jquery.multi-select.js b/js/jquery.multi-select.js
index 1ac180b..1d464e1 100644
--- a/js/jquery.multi-select.js
+++ b/js/jquery.multi-select.js
@@ -150,6 +150,9 @@
if (ms.find("option[value='']")){
ms.find("option[value='']").removeAttr('selected');
}
+ if (method == "select_all" && parentOptgroup.children('.ms-elem-selectable').length > 0){
+ parentOptgroup.children('.ms-optgroup-label').hide();
+ }
if(method != 'init' || ms.data('settings').callbackOnInit){
selectedUl.trigger('change');
selectableUl.trigger('change');