bootstrap-multiselect-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209905ce2f3ed58adb2a4b612d313c503c66ec42
-  data.tar.gz: 8471b006251914b1e32056fb5052f64bfa07a0df
+  metadata.gz: 3b61fad2e4a7ae7fd6ea103d630cc1541403e69c
+  data.tar.gz: 82986b14141417ee6ec1fe9db45cd7d9179bf41c
 SHA512:
-  metadata.gz: ebb318bd3d83fd0aedcdead2a0f38e57463958c7dc120286482913a4c00c68ba4ce8972398c4db442b4da77a77bd77d58f56c2b769a260d4a4a2added9bd3747
-  data.tar.gz: e672577800668d926e952739f5b71433fe3df2ac04f590aa9e1cfdf0c26102ebb46d772ba89748b152522532c5922435df2448debe395861f7e4948f1344b102
+  metadata.gz: 54d6abfd1c2140f5bc5ce0b54fa7558ba8fdae414fa8947feccc558b77d14304032abddb530b68070b23b715a762e959f33613ab2cffe5790d51cdd76169f88d
+  data.tar.gz: 55d9e736173711f2a00c812d41f99ed32d86d6d034f48611868ad024fa1e5d2ca7f8cd5ef674800dd8d82802b8e449d6b0091b39b8644adffc7a6775d3256164

data/Rakefile

@@ -1,38 +1 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'BootstrapMultiselectRails'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+require "bundler/gem_tasks"

data/lib/bootstrap-multiselect/rails/version.rb

@@ -0,0 +1,5 @@
+module BootstrapMultiselect
+	module Rails
+		VERSION = "0.0.5"
+	end
+end

data/lib/rails.rb

@@ -0,0 +1,8 @@
+require "bootstrap-multiselect/version"
+
+module BootstrapMultiselect
+	module Rails
+		class Engine < Rails::Engine
+  		end
+  	end
+end

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

@@ -73,7 +73,7 @@
 
     /**
      * Constructor to create a new multiselect using the given select.
-     *
+     * 
      * @param {jQuery} select
      * @param {Object} options
      * @returns {Multiselect}
@@ -101,10 +101,10 @@
         this.buildDropdown();
         this.buildDropdownOptions();
         this.buildFilter();
-
+        
         this.updateButtonText();
         this.updateSelectAll();
-
+        
         this.$select.hide().after(this.$container);
     };
 
@@ -114,7 +114,7 @@
             /**
              * Default text function will either print 'None selected' in case no
              * option is selected or a list of the selected options up to a length of 3 selected options.
-             *
+             * 
              * @param {jQuery} options
              * @param {jQuery} select
              * @returns {String}
@@ -158,7 +158,7 @@
             },
             /**
              * Create a label.
-             *
+             * 
              * @param {jQuery} element
              * @returns {String}
              */
@@ -168,7 +168,7 @@
             /**
              * Triggered on change of the multiselect.
              * Not triggered when selecting/deselecting options manually.
-             *
+             * 
              * @param {jQuery} option
              * @param {Boolean} checked
              */
@@ -177,19 +177,19 @@
             },
             /**
              * Triggered when the dropdown is shown.
-             *
+             * 
              * @param {jQuery} event
              */
             onDropdownShow: function(event) {
-
+                
             },
             /**
              * Triggered when the dropdown is hidden.
-             *
+             * 
              * @param {jQuery} event
              */
             onDropdownHide: function(event) {
-
+                
             },
             buttonClass: 'btn btn-default',
             dropRight: false,
@@ -199,7 +199,9 @@
             // Maximum height of the dropdown menu.
             // If maximum height is exceeded a scrollbar will be displayed.
             maxHeight: false,
+            checkboxName: 'multiselect',
             includeSelectAllOption: false,
+            includeSelectAllIfMoreThan: 0,
             selectAllText: ' Select all',
             selectAllValue: 'multiselect-all',
             enableFiltering: false,
@@ -210,16 +212,15 @@
             preventInputChangeEvent: false,
             nonSelectedText: 'None selected',
             nSelectedText: 'selected',
-            numberDisplayed: 3
-        },
-
-        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>',
-            li: '<li><a href="javascript:void(0);"><label></label></a></li>',
-            divider: '<li class="divider"></li>',
-            liGroup: '<li><label class="multiselect-group"></label></li>'
+            numberDisplayed: 3,
+            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>',
+                li: '<li><a href="javascript:void(0);"><label></label></a></li>',
+                divider: '<li class="divider"></li>',
+                liGroup: '<li><label class="multiselect-group"></label></li>'
+            }
         },
 
         constructor: Multiselect,
@@ -237,7 +238,7 @@
          * Builds the button of the multiselect.
          */
         buildButton: function() {
-            this.$button = $(this.templates.button).addClass(this.options.buttonClass);
+            this.$button = $(this.options.templates.button).addClass(this.options.buttonClass);
 
             // Adopt active state.
             if (this.$select.prop('disabled')) {
@@ -248,7 +249,7 @@
             }
 
             // Manually add button width if set.
-            if (this.options.buttonWidth && this.options.buttonWidth != 'auto') {
+            if (this.options.buttonWidth && this.options.buttonWidth !== 'auto') {
                 this.$button.css({
                     'width' : this.options.buttonWidth
                 });
@@ -269,7 +270,7 @@
         buildDropdown: function() {
 
             // Build ul.
-            this.$ul = $(this.templates.ul);
+            this.$ul = $(this.options.templates.ul);
 
             if (this.options.dropRight) {
                 this.$ul.addClass('pull-right');
@@ -295,7 +296,7 @@
         buildDropdownOptions: function() {
 
             this.$select.children().each($.proxy(function(index, element) {
-
+                
                 // Support optgroups and options without a group simultaneously.
                 var tag = $(element).prop('tagName')
                     .toLowerCase();
@@ -313,51 +314,50 @@
                     }
 
                 }
-
+                
                 // Other illegal tags will be ignored.
             }, this));
 
             // Bind the change event on the dropdown elements.
             $('li input', this.$ul).on('change', $.proxy(function(event) {
-                var checked = $(event.target).prop('checked') || false;
-                var isSelectAllOption = $(event.target).val() === this.options.selectAllValue;
+                var $target = $(event.target);
+
+                var checked = $target.prop('checked') || false;
+                var isSelectAllOption = $target.val() === this.options.selectAllValue;
 
                 // Apply or unapply the configured selected class.
                 if (this.options.selectedClass) {
                     if (checked) {
-                        $(event.target).parents('li')
+                        $target.parents('li')
                             .addClass(this.options.selectedClass);
                     }
                     else {
-                        $(event.target).parents('li')
+                        $target.parents('li')
                             .removeClass(this.options.selectedClass);
                     }
                 }
 
                 // Get the corresponding option.
-                var value = $(event.target).val();
+                var value = $target.val();
                 var $option = this.getOptionByValue(value);
 
                 var $optionsNotThis = $('option', this.$select).not($option);
-                var $checkboxesNotThis = $('input', this.$container).not($(event.target));
+                var $checkboxesNotThis = $('input', this.$container).not($target);
 
                 if (isSelectAllOption) {
-                    if (this.$select[0][0].value === this.options.selectAllValue) {
-                        var values = [];
-                        var options = $('option[value!="' + this.options.selectAllValue + '"]', this.$select);
-                        for (var i = 0; i < options.length; i++) {
-                            // Additionally check whether the option is visible within the dropcown.
-                            if (options[i].value !== this.options.selectAllValue && this.getInputByValue(options[i].value).is(':visible')) {
-                                values.push(options[i].value);
-                            }
-                        }
+                    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);
-                        }
-                        else {
-                            this.deselect(values);
-                        }
+                    if (checked) {
+                        this.select(values);
+                    }
+                    else {
+                        this.deselect(values);
                     }
                 }
 
@@ -392,7 +392,7 @@
 
                 this.$select.change();
                 this.options.onChange($option, checked);
-
+                
                 this.updateButtonText();
                 this.updateSelectAll();
 
@@ -404,19 +404,21 @@
             $('li a', this.$ul).on('touchstart click', function(event) {
                 event.stopPropagation();
 
+                var $target = $(event.target);
+
                 if (event.shiftKey) {
-                    var checked = $(event.target).prop('checked') || false;
+                    var checked = $target.prop('checked') || false;
 
                     if (checked) {
-                        var prev = $(event.target).parents('li:last')
+                        var prev = $target.parents('li:last')
                             .siblings('li[class="active"]:first');
 
-                        var currentIdx = $(event.target).parents('li')
+                        var currentIdx = $target.parents('li')
                             .index();
                         var prevIdx = prev.index();
 
                         if (currentIdx > prevIdx) {
-                            $(event.target).parents("li:last").prevUntil(prev).each(
+                            $target.parents("li:last").prevUntil(prev).each(
                                 function() {
                                     $(this).find("input:first").prop("checked", true)
                                         .trigger("change");
@@ -424,7 +426,7 @@
                             );
                         }
                         else {
-                            $(event.target).parents("li:last").nextUntil(prev).each(
+                            $target.parents("li:last").nextUntil(prev).each(
                                 function() {
                                     $(this).find("input:first").prop("checked", true)
                                         .trigger("change");
@@ -434,7 +436,7 @@
                     }
                 }
 
-                $(event.target).blur();
+                $target.blur();
             });
 
             // Keyboard support.
@@ -444,7 +446,7 @@
                 }
                 if ((event.keyCode === 9 || event.keyCode === 27)
                         && this.$container.hasClass('open')) {
-
+                    
                     // Close on tab or escape.
                     this.$button.click();
                 }
@@ -487,7 +489,7 @@
 
         /**
          * Create an option using the given select option.
-         *
+         * 
          * @param {jQuery} element
          */
         createOptionValue: function(element) {
@@ -500,9 +502,9 @@
             var value = $(element).val();
             var inputType = this.options.multiple ? "checkbox" : "radio";
 
-            var $li = $(this.templates.li);
+            var $li = $(this.options.templates.li);
             $('label', $li).addClass(inputType);
-            $('label', $li).append('<input type="' + inputType + '" />');
+            $('label', $li).append('<input type="' + inputType + '" name="' + this.options.checkboxName + '" />');
 
             var selected = $(element).prop('selected') || false;
             var $checkbox = $('input', $li);
@@ -534,24 +536,24 @@
 
         /**
          * Creates a divider using the given select option.
-         *
+         * 
          * @param {jQuery} element
          */
         createDivider: function(element) {
-            var $divider = $(this.templates.divider);
+            var $divider = $(this.options.templates.divider);
             this.$ul.append($divider);
         },
 
         /**
          * Creates an optgroup.
-         *
+         * 
          * @param {jQuery} group
          */
         createOptgroup: function(group) {
             var groupName = $(group).prop('label');
 
             // Add a header for the group.
-            var $li = $(this.templates.liGroup);
+            var $li = $(this.options.templates.liGroup);
             $('label', $li).text(groupName);
 
             this.$ul.append($li);
@@ -572,12 +574,15 @@
          */
         buildSelectAll: function() {
             var alreadyHasSelectAll = this.hasSelectAll();
-
-            // If options.includeSelectAllOption === true, add the include all checkbox.
-            if (this.options.includeSelectAllOption && this.options.multiple && !alreadyHasSelectAll) {
+            
+            if (!alreadyHasSelectAll && this.options.includeSelectAllOption && this.options.multiple
+                    && $('option[data-role!="divider"]', 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.$select.prepend('<option value="' + this.options.selectAllValue + '">' + this.options.selectAllText + '</option>');
             }
         },
@@ -593,7 +598,7 @@
 
                 if (this.$select.find('option').length >= enableFilterLength) {
 
-                    this.$filter = $(this.templates.filter);
+                    this.$filter = $(this.options.templates.filter);
                     $('input', this.$filter).attr('placeholder', this.options.filterPlaceholder);
                     this.$ul.prepend(this.$filter);
 
@@ -612,19 +617,22 @@
                                     var value = $('input', element).val();
                                     var text = $('label', element).text();
 
+                                    var filterCandidate = '';
+                                    if ((this.options.filterBehavior === 'text')) {
+                                        filterCandidate = text;
+                                    }
+                                    else if ((this.options.filterBehavior === 'value')) {
+                                        filterCandidate = value;
+                                    }
+                                    else if (this.options.filterBehavior === 'both') {
+                                        filterCandidate = text + '\n' + value;
+                                    }
+
                                     if (value !== this.options.selectAllValue && text) {
                                         // by default lets assume that element is not
                                         // interesting for this search
                                         var showElement = false;
 
-                                        var filterCandidate = '';
-                                        if ((this.options.filterBehavior === 'text' || this.options.filterBehavior === 'both')) {
-                                            filterCandidate = text;
-                                        }
-                                        if ((this.options.filterBehavior === 'value' || this.options.filterBehavior === 'both')) {
-                                            filterCandidate = value;
-                                        }
-
                                         if (this.options.enableCaseInsensitiveFiltering && filterCandidate.toLowerCase().indexOf(this.query.toLowerCase()) > -1) {
                                             showElement = true;
                                         }
@@ -655,6 +663,7 @@
         destroy: function() {
             this.$container.remove();
             this.$select.show();
+            this.$select.data('multiselect', null);
         },
 
         /**
@@ -702,11 +711,11 @@
 
         /**
          * Select all options of the given values.
-         *
+         * 
          * @param {Array} selectValues
          */
         select: function(selectValues) {
-            if(selectValues && !$.isArray(selectValues)) {
+            if(!$.isArray(selectValues)) {
                 selectValues = [selectValues];
             }
 
@@ -730,7 +739,7 @@
 
         /**
          * Clears all selected items
-         *
+         * 
          */
         clearSelection: function () {
 
@@ -751,11 +760,11 @@
 
         /**
          * Deselects all options of the given values.
-         *
+         * 
          * @param {Array} deselectValues
          */
         deselect: function(deselectValues) {
-            if(deselectValues && !$.isArray(deselectValues)) {
+            if(!$.isArray(deselectValues)) {
                 deselectValues = [deselectValues];
             }
 
@@ -794,14 +803,14 @@
             this.buildSelectAll();
             this.buildDropdownOptions();
             this.buildFilter();
-
+            
             this.updateButtonText();
             this.updateSelectAll();
         },
 
         /**
          * The provided data will be used to build the dropdown.
-         *
+         * 
          * @param {Array} dataprovider
          */
         dataprovider: function(dataprovider) {
@@ -834,7 +843,7 @@
 
         /**
          * Set the options.
-         *
+         * 
          * @param {Array} options
          */
         setOptions: function(options) {
@@ -843,30 +852,30 @@
 
         /**
          * Merges the given options with the default options.
-         *
+         * 
          * @param {Array} options
          * @returns {Array}
          */
         mergeOptions: function(options) {
-            return $.extend({}, this.defaults, this.options, options);
+            return $.extend(true, {}, this.defaults, options);
         },
-
+        
         /**
          * Checks whether a select all option is present.
-         *
+         * 
          * @returns {Boolean}
          */
         hasSelectAll: function() {
-            return this.$select[0][0] ? this.$select[0][0].value === this.options.selectAllValue : false;
+            return $('option[value="' + this.options.selectAllValue + '"]', this.$select).length > 0;
         },
-
+        
         /**
          * Updates the select all option based on the currently selected options.
          */
         updateSelectAll: function() {
             if (this.hasSelectAll()) {
                 var selected = this.getSelected();
-
+                
                 if (selected.length === $('option:not([data-role=divider])', this.$select).length - 1) {
                     this.select(this.options.selectAllValue);
                 }
@@ -875,16 +884,16 @@
                 }
             }
         },
-
+        
         /**
          * Update the button text and its title based on the currently selected options.
          */
         updateButtonText: function() {
             var options = this.getSelected();
-
+            
             // First update the displayed button text.
             $('button', this.$container).html(this.options.buttonText(options, this.$select));
-
+            
             // Now update the title attribute of the button.
             $('button', this.$container).attr('title', this.options.buttonTitle(options, this.$select));
 
@@ -892,7 +901,7 @@
 
         /**
          * Get all selected options.
-         *
+         * 
          * @returns {jQUery}
          */
         getSelected: function() {
@@ -903,7 +912,7 @@
 
         /**
          * Gets a select option by its value.
-         *
+         * 
          * @param {String} value
          * @returns {jQuery}
          */
@@ -914,7 +923,7 @@
 
             for (var i = 0; i < options.length; i = i + 1) {
                 var option = options[i];
-                if (option.value == valueToCompare) {
+                if (option.value === valueToCompare) {
                     return $(option);
                 }
             }
@@ -922,7 +931,7 @@
 
         /**
          * Get the input (radio/checkbox) by its value.
-         *
+         * 
          * @param {String} value
          * @returns {jQuery}
          */
@@ -933,7 +942,7 @@
 
             for (var i = 0; i < checkboxes.length; i = i + 1) {
                 var checkbox = checkboxes[i];
-                if (checkbox.value == valueToCompare) {
+                if (checkbox.value === valueToCompare) {
                     return $(checkbox);
                 }
             }
@@ -958,7 +967,7 @@
         return this.each(function() {
             var data = $(this).data('multiselect');
             var options = typeof option === 'object' && option;
-
+            
             // Initialize the multiselect.
             if (!data) {
                 data = new Multiselect(this, options);
@@ -968,7 +977,7 @@
             // Call multiselect method.
             if (typeof option === 'string') {
                 data[option](parameter);
-
+                
                 if (option === 'destroy') {
                     $(this).data('multiselect', false);
                 }