bootstrap-multiselect_rails 0.9.4 → 0.9.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0408e8efe212dd67894af953f92040d999bfbcb0
+  data.tar.gz: d57f73b32a109390f97a4ee70fab3d5aa62d00c2
+SHA512:
+  metadata.gz: de5dab8cd79b54ea807d862ed69ebe04510f4d55a31b933097ab8c098691d0fc5e51b42c9bde5874b1a2cdec1a4033b58b2c4f71a0d023d8ee4e49768fe093bf
+  data.tar.gz: 520049895048b42e58280de5819fab8421ae16d7fd8f06f2157bb40f8fc4903b99bea46aa772292917a12dd2d8e0f88a63195e34c7e18783941afb20d07ccbe8

data/README.md

@@ -1,7 +1,8 @@
 # bootstrap-multiselect_rails
 
-This gem packages the [bootstrap-multiselect](https://github.com/davidstutz/bootstrap-multiselect) library for the Rails 3.1+ asset pipeline.
+[![Gem Version](https://badge.fury.io/rb/bootstrap-multiselect_rails.svg)](http://badge.fury.io/rb/bootstrap-multiselect_rails)
 
+This gem packages the [bootstrap-multiselect](https://github.com/davidstutz/bootstrap-multiselect) library for the Rails 3.1+ asset pipeline.
 
 ## Installation
 

data/lib/bootstrap-multiselect_rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapMultiselect
   module Rails
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

data/vendor/assets/javascripts/bootstrap-multiselect.js

@@ -7,8 +7,17 @@
  * Dual licensed under the BSD-3-Clause and the Apache License, Version 2.0.
  */
 !function($) {
-
+ 
     "use strict";// jshint ;_;
+    
+    if (Array.prototype.forEach === null || Array.prototype.forEach === undefined) {
+        Array.prototype.forEach = function (func) {
+            var index;
+            for (index = 0; index < this.length; ++index) {
+                func(this[index]);
+            }
+        };
+    }
 
     if (typeof ko !== 'undefined' && ko.bindingHandlers && !ko.bindingHandlers.multiselect) {
         ko.bindingHandlers.multiselect = {
@@ -97,8 +106,8 @@
         // Build select all if enabled.
         this.buildContainer();
         this.buildButton();
-        this.buildSelectAll();
         this.buildDropdown();
+        this.buildSelectAll();
         this.buildDropdownOptions();
         this.buildFilter();
         
@@ -216,10 +225,10 @@
             templates: {
                 button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"></button>',
                 ul: '<ul class="multiselect-container dropdown-menu"></ul>',
-                filter: '<div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text"></div>',
+                filter: '<li class="multiselect-item filter"><div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text"></div></li>',
                 li: '<li><a href="javascript:void(0);"><label></label></a></li>',
-                divider: '<li class="divider"></li>',
-                liGroup: '<li><label class="multiselect-group"></label></li>'
+                divider: '<li class="multiselect-item divider"></li>',
+                liGroup: '<li class="multiselect-item group"><label class="multiselect-group"></label></li>'
             }
         },
 
@@ -300,6 +309,10 @@
                 // Support optgroups and options without a group simultaneously.
                 var tag = $(element).prop('tagName')
                     .toLowerCase();
+            
+                if ($(element).prop('value') == this.options.selectAllValue) {
+                    return;
+                }
 
                 if (tag === 'optgroup') {
                     this.createOptgroup(element);
@@ -345,56 +358,51 @@
                 var $checkboxesNotThis = $('input', this.$container).not($target);
 
                 if (isSelectAllOption) {
-                    var values = [];
-                    
-                    // Select the visible checkboxes except the "select-all" and possible divider.
-                    var availableInputs = $('li input[value!="' + this.options.selectAllValue + '"][data-role!="divider"]', this.$ul).filter(':visible');
-                    for (var i = 0, j = availableInputs.length; i < j; i++) {
-                        values.push(availableInputs[i].value);
-                    }
-
                     if (checked) {
-                        this.select(values);
+                        this.selectall();
                     }
                     else {
-                        this.deselect(values);
+                        this.deselectall();
                     }
                 }
 
-                if (checked) {
-                    $option.prop('selected', true);
-
-                    if (this.options.multiple) {
-                        // Simply select additional option.
+                if(!isSelectAllOption){
+                    if (checked) {
                         $option.prop('selected', true);
-                    }
-                    else {
-                        // Unselect all other options and corresponding checkboxes.
-                        if (this.options.selectedClass) {
-                            $($checkboxesNotThis).parents('li').removeClass(this.options.selectedClass);
+
+                        if (this.options.multiple) {
+                            // Simply select additional option.
+                            $option.prop('selected', true);
                         }
+                        else {
+                            // Unselect all other options and corresponding checkboxes.
+                            if (this.options.selectedClass) {
+                                $($checkboxesNotThis).parents('li').removeClass(this.options.selectedClass);
+                            }
 
-                        $($checkboxesNotThis).prop('checked', false);
-                        $optionsNotThis.prop('selected', false);
+                            $($checkboxesNotThis).prop('checked', false);
+                            $optionsNotThis.prop('selected', false);
 
-                        // It's a single selection, so close.
-                        this.$button.click();
-                    }
+                            // It's a single selection, so close.
+                            this.$button.click();
+                        }
 
-                    if (this.options.selectedClass === "active") {
-                        $optionsNotThis.parents("a").css("outline", "");
+                        if (this.options.selectedClass === "active") {
+                            $optionsNotThis.parents("a").css("outline", "");
+                        }
+                    }
+                    else {
+                        // Unselect option.
+                        $option.prop('selected', false);
                     }
-                }
-                else {
-                    // Unselect option.
-                    $option.prop('selected', false);
                 }
 
                 this.$select.change();
-                this.options.onChange($option, checked);
-                
+
                 this.updateButtonText();
                 this.updateSelectAll();
+                
+                this.options.onChange($option, checked);
 
                 if(this.options.preventInputChangeEvent) {
                     return false;
@@ -440,7 +448,7 @@
             });
 
             // Keyboard support.
-            this.$container.on('keydown', $.proxy(function(event) {
+            this.$container.off('keydown.multiselect').on('keydown.multiselect', $.proxy(function(event) {
                 if ($('input[type="text"]', this.$container).is(':focus')) {
                     return;
                 }
@@ -451,7 +459,7 @@
                     this.$button.click();
                 }
                 else {
-                    var $items = $(this.$container).find("li:not(.divider):visible a");
+                    var $items = $(this.$container).find("li:not(.divider):not(.disabled) a").filter(":visible");
 
                     if (!$items.length) {
                         return;
@@ -511,6 +519,7 @@
             $checkbox.val(value);
 
             if (value === this.options.selectAllValue) {
+                $li.addClass("multiselect-item multiselect-all");
                 $checkbox.parent().parent()
                     .addClass('multiselect-all');
             }
@@ -522,6 +531,8 @@
             if ($(element).is(':disabled')) {
                 $checkbox.attr('disabled', 'disabled')
                     .prop('disabled', true)
+                    .parents('a')
+                    .attr("tabindex", "-1")
                     .parents('li')
                     .addClass('disabled');
             }
@@ -570,20 +581,35 @@
 
         /**
          * Build the selct all.
-         * Checks if a select all ahs already been created.
+         * Checks if a select all has already been created.
          */
         buildSelectAll: function() {
             var alreadyHasSelectAll = this.hasSelectAll();
             
             if (!alreadyHasSelectAll && this.options.includeSelectAllOption && this.options.multiple
-                    && $('option[data-role!="divider"]', this.$select).length > this.options.includeSelectAllIfMoreThan) {
+                    && $('option', this.$select).length > this.options.includeSelectAllIfMoreThan) {
                 
                 // Check whether to add a divider after the select all.
                 if (this.options.includeSelectAllDivider) {
-                    this.$select.prepend('<option value="" disabled="disabled" data-role="divider">');
+                    this.$ul.prepend($(this.options.templates.divider));
                 }
-                
-                this.$select.prepend('<option value="' + this.options.selectAllValue + '">' + this.options.selectAllText + '</option>');
+
+                var $li = $(this.options.templates.li);
+                $('label', $li).addClass("checkbox");
+                $('label', $li).append('<input type="checkbox" name="' + this.options.checkboxName + '" />');
+
+                var $checkbox = $('input', $li);
+                $checkbox.val(this.options.selectAllValue);
+
+                $li.addClass("multiselect-item multiselect-all");
+                $checkbox.parent().parent()
+                    .addClass('multiselect-all');
+
+                $('label', $li).append(" " + this.options.selectAllText);
+
+                this.$ul.prepend($li);
+
+                $checkbox.prop('checked', false);
             }
         },
 
@@ -641,16 +667,16 @@
                                         }
 
                                         if (showElement) {
-                                            $(element).show();
+                                            $(element).show().removeClass("filter-hidden");
                                         }
                                         else {
-                                            $(element).hide();
+                                            $(element).hide().addClass("filter-hidden");
                                         }
                                     }
                                 }, this));
                             }
 
-                            // TODO: check whether select all option needs to be updated.
+                            this.updateSelectAll();
                         }, this), 300, this);
                     }, this));
                 }
@@ -725,6 +751,11 @@
                 var $option = this.getOptionByValue(value);
                 var $checkbox = this.getInputByValue(value);
 
+                if($option === void(0) || $checkbox === void(0))
+                {
+                  continue;
+                }
+                
                 if (this.options.selectedClass) {
                     $checkbox.parents('li')
                         .addClass(this.options.selectedClass);
@@ -742,20 +773,9 @@
          * 
          */
         clearSelection: function () {
-
-            var selected = this.getSelected();
-
-            if (selected.length) {
-
-                var arry = [];
-
-                for (var i = 0; i < selected.length; i = i + 1) {
-                    arry.push(selected[i].value);
-                }
-
-                this.deselect(arry);
-                this.$select.change();
-            }
+            this.deselectall(false);
+            this.updateButtonText();
+            this.updateSelectAll();
         },
 
         /**
@@ -775,6 +795,11 @@
                 var $option = this.getOptionByValue(value);
                 var $checkbox = this.getInputByValue(value);
 
+                if($option === void(0) || $checkbox === void(0))
+                {
+                  continue;
+                }
+
                 if (this.options.selectedClass) {
                     $checkbox.parents('li')
                         .removeClass(this.options.selectedClass);
@@ -786,6 +811,57 @@
 
             this.updateButtonText();
         },
+        
+        /**
+         * Selects all enabled & visible options.
+         * 
+         */
+        selectall: function () {
+            var allCheckboxes = $("li input[type='checkbox']:enabled", this.$ul),
+                visibleCheckboxes = allCheckboxes.filter(":visible"),
+                allCheckboxesCount = allCheckboxes.length,
+                visibleCheckboxesCount = visibleCheckboxes.length;
+                
+            visibleCheckboxes.prop('checked', true);
+            $("li:not(.divider):not(.disabled)", this.$ul).filter(":visible").addClass(this.options.selectedClass);
+            
+            if (allCheckboxesCount === visibleCheckboxesCount) {
+                $("option:enabled", this.$select).prop('selected', true);
+            }
+            else {
+                var values = visibleCheckboxes.map(function() { return $(this).val() }).get();
+                $("option:enabled", this.$select).filter(function(index){ return $.inArray($(this).val(), values) !== -1; }).prop('selected', true);
+            }
+        },
+
+        /**
+         * Deselects all options.
+         * If justVisible is true or not specified, only visible options are deselected.
+         * 
+         * @param {Boolean} justVisible
+         */
+        deselectall: function (justVisible) {
+            var allCheckboxes = $("li input[type='checkbox']:enabled", this.$ul),                
+                justVisible = typeof justVisible === 'undefined' ? true : justVisible,
+                visibleCheckboxes = void(0);
+            
+            if(justVisible) {
+                var values = void(0);                
+                visibleCheckboxes = allCheckboxes.filter(":visible");
+                visibleCheckboxes.prop('checked', false);
+                
+                values = visibleCheckboxes.map(function() { return $(this).val() }).get();
+                
+                $("option:enabled", this.$select).filter(function(index){ return $.inArray($(this).val(), values) !== -1; }).prop('selected', false);
+                
+                $("li:not(.divider):not(.disabled)", this.$ul).filter(":visible").removeClass(this.options.selectedClass);
+                
+            }else {
+                allCheckboxes.prop('checked', false);
+                $("option:enabled", this.$select).prop('selected', false);
+                $("li:not(.divider):not(.disabled)", this.$ul).removeClass(this.options.selectedClass);
+            }
+        },
 
         /**
          * Rebuild the plugin.
@@ -794,9 +870,6 @@
         rebuild: function() {
             this.$ul.html('');
 
-            // Remove select all option in select.
-            $('option[value="' + this.options.selectAllValue + '"]', this.$select).remove();
-
             // Important to distinguish between radios and checkboxes.
             this.options.multiple = this.$select.attr('multiple') === "multiple";
 
@@ -806,6 +879,10 @@
             
             this.updateButtonText();
             this.updateSelectAll();
+            
+            if (this.options.dropRight) {
+                this.$ul.addClass('pull-right');
+            }
         },
 
         /**
@@ -815,10 +892,24 @@
          */
         dataprovider: function(dataprovider) {
             var optionDOM = "";
-            dataprovider.forEach(function (option) {
-                optionDOM += '<option value="' + option.value + '">' + option.label + '</option>';
-            });
+            var groupCounter = 0;
+
+            $.each(dataprovider, function (option) {
+                if ($.isArray(option.children)) {
+                    groupCounter++;
+                    optionDOM += '<optgroup label="' + (option.title || 'Group ' + groupCounter) + '">';
 
+                    option.children.forEach(function(subOption) {
+                        optionDOM += '<option value="' + subOption.value + '">' + (subOption.label || subOption.value) + '</option>';
+                    });
+
+                    optionDOM += '</optgroup>';
+                }
+                else {
+                    optionDOM += '<option value="' + option.value + '">' + (option.label || option.value) + '</option>';
+                }
+            });
+            
             this.$select.html(optionDOM);
             this.rebuild();
         },
@@ -861,26 +952,32 @@
         },
         
         /**
-         * Checks whether a select all option is present.
+         * Checks whether a select all checkbox is present.
          * 
          * @returns {Boolean}
          */
         hasSelectAll: function() {
-            return $('option[value="' + this.options.selectAllValue + '"]', this.$select).length > 0;
+            return $('li.' + this.options.selectAllValue, this.$ul).length > 0;
         },
         
         /**
-         * Updates the select all option based on the currently selected options.
+         * Updates the select all checkbox based on the currently displayed and selected checkboxes.
          */
         updateSelectAll: function() {
             if (this.hasSelectAll()) {
-                var selected = this.getSelected();
+                var allBoxes = $("li:not(.multiselect-item):not(.filter-hidden) input:enabled", this.$ul),
+                    allBoxesLength = allBoxes.length,
+                    checkedBoxesLength = allBoxes.filter(":checked").length,
+                    selectAllLi  = $("li." + this.options.selectAllValue, this.$ul),
+                    selectAllInput = selectAllLi.find("input");
                 
-                if (selected.length === $('option:not([data-role=divider])', this.$select).length - 1) {
-                    this.select(this.options.selectAllValue);
+                if (checkedBoxesLength > 0 && checkedBoxesLength === allBoxesLength) {
+                    selectAllInput.prop("checked", true);
+                    selectAllLi.addClass(this.options.selectedClass);
                 }
                 else {
-                    this.deselect(this.options.selectAllValue);
+                    selectAllInput.prop("checked", false);
+                    selectAllLi.removeClass(this.options.selectedClass);
                 }
             }
         },
@@ -905,9 +1002,7 @@
          * @returns {jQUery}
          */
         getSelected: function() {
-            return $('option[value!="' + this.options.selectAllValue + '"]:selected', this.$select).filter(function() {
-                return $(this).prop('selected');
-            });
+            return $('option', this.$select).filter(":selected");
         },
 
         /**

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-multiselect_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.4
-  prerelease: 
+  version: 0.9.5
 platform: ruby
 authors:
 - Trevor Strieber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem packages the Bootstrap multiselect (JS & CSS) for Rails 3.1+
@@ -51,36 +46,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
 - lib/bootstrap-multiselect_rails.rb
 - lib/bootstrap-multiselect_rails/version.rb
-- vendor/assets/stylesheets/bootstrap-multiselect.css
 - vendor/assets/javascripts/bootstrap-multiselect.js
-- LICENSE.txt
-- README.md
+- vendor/assets/stylesheets/bootstrap-multiselect.css
 homepage: http://github.com/TrevorS/bootstrap-multiselect_rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bootstrap 2/3 multiselect's JS & CSS for Rails 3.1+ asset pipeline.
 test_files: []
-has_rdoc: