Fix #740 Group label inside an li tag

ehynds · Feb 3, 2018 · 44624c0 · 44624c0
1 parent 5f55116
commit 44624c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/jquery.multiselect.filter.js b/src/jquery.multiselect.filter.js
@@ -181,7 +181,7 @@
       // show/hide optgroups
       $groups.each(function() {
         var $this = $(this);
-        if (!$this.children('li').filter(':visible').length)
+        if (!$this.children('ul').children('li').filter(':visible').length)
           $this.hide();
       });
       this.instance._setMenuHeight();

diff --git a/src/jquery.multiselect.js b/src/jquery.multiselect.js
@@ -307,13 +307,16 @@
           });
 
           // Build the list section for this optgroup, complete w/ option inputs...
-          var $optionGroup = $( document.createElement('ul') )
-                .addClass('ui-multiselect-optgroup' 
-                          + (self.options.groupColumns ? ' ui-multiselect-columns' : '') 
-                          + (elem.className && ' ') + elem.className)
-                .append( $( document.createElement('a') ).text( elem.getAttribute('label') ), options);
-
-          list.push($optionGroup);
+          var $optGroupItem = $( document.createElement('li') )
+            .addClass('ui-multiselect-optgroup' 
+            + (self.options.groupColumns ? ' ui-multiselect-columns' : '') 
+            + (elem.className && ' ') + elem.className)
+            .append( $( document.createElement('a') )                  
+              .text( elem.getAttribute('label') ) );
+          var $optionGroup = $( document.createElement('ul') ).append(options)
+          $optGroupItem.append($optionGroup)
+
+          list.push($optGroupItem);
         }
         else {
           list.push(self._makeOption(elem));
@@ -474,7 +477,7 @@
         e.preventDefault();
 
         var $this = $(this);
-        var $inputs = $this.parent().find('input').filter(':visible:not(:disabled)');
+        var $inputs = $this.parent().find('ul input').filter(':visible:not(:disabled)');
         var nodes = $inputs.get();
         var label = this.textContent;