From a58894cdf730e2c8d20d2ea8dcdcc5d539366812 Mon Sep 17 00:00:00 2001 From: mespinozas Date: Tue, 12 Apr 2016 19:17:53 -0300 Subject: [PATCH] Added diacriticsFiltering match --- dist/js/bootstrap-multiselect.js | 656 +++++++++++++++++-------------- 1 file changed, 365 insertions(+), 291 deletions(-) diff --git a/dist/js/bootstrap-multiselect.js b/dist/js/bootstrap-multiselect.js index a7c71eab..42524ab9 100644 --- a/dist/js/bootstrap-multiselect.js +++ b/dist/js/bootstrap-multiselect.js @@ -1,23 +1,23 @@ /** * Bootstrap Multiselect (https://github.com/davidstutz/bootstrap-multiselect) - * + * * Apache License, Version 2.0: * Copyright (c) 2012 - 2015 David Stutz - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations * under the License. - * + * * BSD 3-Clause License: * Copyright (c) 2012 - 2015 David Stutz * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * - Redistributions of source code must retain the above copyright notice, @@ -28,7 +28,7 @@ * - Neither the name of David Stutz nor the names of its contributors may be * used to endorse or promote products derived from this software without * specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -41,14 +41,117 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -!function ($) { - "use strict";// jshint ;_; +(!function ($) { + 'use strict';// jshint ;_; + + var defaultDiacriticsRemovalMap = [ + {'base': 'A', 'letters': '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'}, + {'base': 'AA','letters': '\uA732'}, + {'base': 'AE','letters': '\u00C6\u01FC\u01E2'}, + {'base': 'AO','letters': '\uA734'}, + {'base': 'AU','letters': '\uA736'}, + {'base': 'AV','letters': '\uA738\uA73A'}, + {'base': 'AY','letters': '\uA73C'}, + {'base': 'B', 'letters': '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181'}, + {'base': 'C', 'letters': '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E'}, + {'base': 'D', 'letters': '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779'}, + {'base': 'DZ','letters': '\u01F1\u01C4'}, + {'base': 'Dz','letters': '\u01F2\u01C5'}, + {'base': 'E', 'letters': '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'}, + {'base': 'F', 'letters': '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B'}, + {'base': 'G', 'letters': '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'}, + {'base': 'H', 'letters': '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D'}, + {'base': 'I', 'letters': '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'}, + {'base': 'J', 'letters': '\u004A\u24BF\uFF2A\u0134\u0248'}, + {'base': 'K', 'letters': '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2'}, + {'base': 'L', 'letters': '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'}, + {'base': 'LJ','letters': '\u01C7'}, + {'base': 'Lj','letters': '\u01C8'}, + {'base': 'M', 'letters': '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C'}, + {'base': 'N', 'letters': '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'}, + {'base': 'NJ','letters': '\u01CA'}, + {'base': 'Nj','letters': '\u01CB'}, + {'base': 'O', 'letters': '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'}, + {'base': 'OI','letters': '\u01A2'}, + {'base': 'OO','letters': '\uA74E'}, + {'base': 'OU','letters': '\u0222'}, + {'base': 'OE','letters': '\u008C\u0152'}, + {'base': 'oe','letters': '\u009C\u0153'}, + {'base': 'P', 'letters': '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754'}, + {'base': 'Q', 'letters': '\u0051\u24C6\uFF31\uA756\uA758\u024A'}, + {'base': 'R', 'letters': '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'}, + {'base': 'S', 'letters': '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'}, + {'base': 'T', 'letters': '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'}, + {'base': 'TZ','letters': '\uA728'}, + {'base': 'U', 'letters': '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'}, + {'base': 'V', 'letters': '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245'}, + {'base': 'VY','letters': '\uA760'}, + {'base': 'W', 'letters': '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72'}, + {'base': 'X', 'letters': '\u0058\u24CD\uFF38\u1E8A\u1E8C'}, + {'base': 'Y', 'letters': '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'}, + {'base': 'Z', 'letters': '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762'}, + {'base': 'a', 'letters': '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'}, + {'base': 'aa','letters': '\uA733'}, + {'base': 'ae','letters': '\u00E6\u01FD\u01E3'}, + {'base': 'ao','letters': '\uA735'}, + {'base': 'au','letters': '\uA737'}, + {'base': 'av','letters': '\uA739\uA73B'}, + {'base': 'ay','letters': '\uA73D'}, + {'base': 'b', 'letters': '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253'}, + {'base': 'c', 'letters': '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184'}, + {'base': 'd', 'letters': '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A'}, + {'base': 'dz','letters': '\u01F3\u01C6'}, + {'base': 'e', 'letters': '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'}, + {'base': 'f', 'letters': '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C'}, + {'base': 'g', 'letters': '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'}, + {'base': 'h', 'letters': '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'}, + {'base': 'hv','letters': '\u0195'}, + {'base': 'i', 'letters': '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'}, + {'base': 'j', 'letters': '\u006A\u24D9\uFF4A\u0135\u01F0\u0249'}, + {'base': 'k', 'letters': '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3'}, + {'base': 'l', 'letters': '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'}, + {'base': 'lj','letters': '\u01C9'}, + {'base': 'm', 'letters': '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F'}, + {'base': 'n', 'letters': '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'}, + {'base': 'nj','letters': '\u01CC'}, + {'base': 'o', 'letters': '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'}, + {'base': 'oi','letters': '\u01A3'}, + {'base': 'ou','letters': '\u0223'}, + {'base': 'oo','letters': '\uA74F'}, + {'base': 'p','letters': '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755'}, + {'base': 'q','letters': '\u0071\u24E0\uFF51\u024B\uA757\uA759'}, + {'base': 'r','letters': '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'}, + {'base': 's','letters': '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'}, + {'base': 't','letters': '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'}, + {'base': 'tz','letters': '\uA729'}, + {'base': 'u','letters': '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'}, + {'base': 'v','letters': '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C'}, + {'base': 'vy','letters': '\uA761'}, + {'base': 'w','letters': '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73'}, + {'base': 'x','letters': '\u0078\u24E7\uFF58\u1E8B\u1E8D'}, + {'base': 'y','letters': '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'}, + {'base': 'z','letters': '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763'} + ]; + + var diacriticsMap = {}; + for (var i = 0; i < defaultDiacriticsRemovalMap .length; i++) { + var letters = defaultDiacriticsRemovalMap [i].letters; + for (var j = 0; j < letters.length ; j++) { + diacriticsMap[letters[j]] = defaultDiacriticsRemovalMap [i].base; + } + } + + function removeDiacritics(str) { + return str.replace(/[^\u0000-\u007E]/g, function (a) { + return diacriticsMap[a] || a; + }); + } if (typeof ko !== 'undefined' && ko.bindingHandlers && !ko.bindingHandlers.multiselect) { ko.bindingHandlers.multiselect = { after: ['options', 'value', 'selectedOptions', 'enable', 'disable'], - init: function(element, valueAccessor, allBindings, viewModel, bindingContext) { + init: function (element, valueAccessor, allBindings, viewModel, bindingContext) { var $element = $(element); var config = ko.toJS(valueAccessor()); @@ -58,12 +161,14 @@ var options = allBindings.get('options'); if (ko.isObservable(options)) { ko.computed({ - read: function() { + read: function () { options(); - setTimeout(function() { + setTimeout(function () { var ms = $element.data('multiselect'); - if (ms) + if (ms) { ms.updateOriginalOptions();//Not sure how beneficial this is. + } + $element.multiselect('rebuild'); }, 1); }, @@ -79,9 +184,9 @@ var value = allBindings.get('value'); if (ko.isObservable(value)) { ko.computed({ - read: function() { + read: function () { value(); - setTimeout(function() { + setTimeout(function () { $element.multiselect('refresh'); }, 1); }, @@ -96,9 +201,9 @@ var selectedOptions = allBindings.get('selectedOptions'); if (ko.isObservable(selectedOptions)) { ko.computed({ - read: function() { + read: function () { selectedOptions(); - setTimeout(function() { + setTimeout(function () { $element.multiselect('refresh'); }, 1); }, @@ -109,10 +214,11 @@ var setEnabled = function (enable) { setTimeout(function () { - if (enable) + if (enable) { $element.multiselect('enable'); - else + } else { $element.multiselect('disable'); + } }); }; @@ -144,12 +250,12 @@ } } - ko.utils.domNodeDisposal.addDisposeCallback(element, function() { + ko.utils.domNodeDisposal.addDisposeCallback(element, function () { $element.multiselect('destroy'); }); }, - update: function(element, valueAccessor, allBindings, viewModel, bindingContext) { + update: function (element, valueAccessor, allBindings, viewModel, bindingContext) { var $element = $(element); var config = ko.toJS(valueAccessor()); @@ -175,12 +281,12 @@ function Multiselect(select, options) { this.$select = $(select); - + // Placeholder via data attributes if (this.$select.attr("data-placeholder")) { options.nonSelectedText = this.$select.data("placeholder"); } - + this.options = this.mergeOptions($.extend({}, options, this.$select.data())); // Initialization. @@ -197,7 +303,7 @@ this.options.onDropdownShown = $.proxy(this.options.onDropdownShown, this); this.options.onDropdownHidden = $.proxy(this.options.onDropdownHidden, this); this.options.onInitialized = $.proxy(this.options.onInitialized, this); - + // Build select all if enabled. this.buildContainer(); this.buildButton(); @@ -212,7 +318,7 @@ if (this.options.disableIfEmpty && $('option', this.$select).length <= 0) { this.disable(); } - + this.$select.hide().after(this.$container); this.options.onInitialized(this.$select, this.$container); } @@ -224,63 +330,50 @@ * 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} */ - buttonText: function(options, select) { - if (this.disabledText.length > 0 - && (this.disableIfEmpty || select.prop('disabled')) - && options.length == 0) { - + buttonText: function (options, select) { + if (this.disabledText.length > 0 && (this.disableIfEmpty || select.prop('disabled')) && options.length === 0) { return this.disabledText; - } - else if (options.length === 0) { + } else if (options.length === 0) { return this.nonSelectedText; - } - else if (this.allSelectedText - && options.length === $('option', $(select)).length - && $('option', $(select)).length !== 1 - && this.multiple) { - + } else if (this.allSelectedText && options.length === $('option', $(select)).length && $('option', $(select)).length !== 1 && this.multiple) { if (this.selectAllNumber) { return this.allSelectedText + ' (' + options.length + ')'; - } - else { + } else { return this.allSelectedText; } - } - else if (options.length > this.numberDisplayed) { + } else if (options.length > this.numberDisplayed) { return options.length + ' ' + this.nSelectedText; - } - else { + } else { var selected = ''; var delimiter = this.delimiterText; - - options.each(function() { + + options.each(function () { var label = ($(this).attr('label') !== undefined) ? $(this).attr('label') : $(this).text(); selected += label + delimiter; }); - + return selected.substr(0, selected.length - 2); } }, /** * Updates the title of the button similar to the buttonText function. - * + * * @param {jQuery} options * @param {jQuery} select * @returns {@exp;selected@call;substr} */ - buttonTitle: function(options, select) { + buttonTitle: function (options, select) { if (options.length === 0) { return this.nonSelectedText; - } - else { + } else { var selected = ''; var delimiter = this.delimiterText; - + options.each(function () { var label = ($(this).attr('label') !== undefined) ? $(this).attr('label') : $(this).text(); selected += label + delimiter; @@ -294,7 +387,7 @@ * @param {jQuery} element * @returns {String} */ - optionLabel: function(element){ + optionLabel: function (element) { return $(element).attr('label') || $(element).text(); }, /** @@ -303,18 +396,18 @@ * @param {jQuery} element * @returns {String} */ - optionClass: function(element) { + optionClass: function (element) { return $(element).attr('class') || ''; }, /** * Triggered on change of the multiselect. - * + * * Not triggered when selecting/deselecting options manually. - * + * * @param {jQuery} option * @param {Boolean} checked */ - onChange : function(option, checked) { + onChange : function (option, checked) { }, /** @@ -322,7 +415,7 @@ * * @param {jQuery} event */ - onDropdownShow: function(event) { + onDropdownShow: function (event) { }, /** @@ -330,30 +423,30 @@ * * @param {jQuery} event */ - onDropdownHide: function(event) { + onDropdownHide: function (event) { }, /** * Triggered after the dropdown is shown. - * + * * @param {jQuery} event */ - onDropdownShown: function(event) { - + onDropdownShown: function (event) { + }, /** * Triggered after the dropdown is hidden. - * + * * @param {jQuery} event */ - onDropdownHidden: function(event) { - + onDropdownHidden: function (event) { + }, /** * Triggered on select all. */ - onSelectAll: function(checked) { - + onSelectAll: function (checked) { + }, /** * Triggered after initializing. @@ -361,7 +454,7 @@ * @param {jQuery} $select * @param {jQuery} $container */ - onInitialized: function($select, $container) { + onInitialized: function ($select, $container) { }, enableHTML: false, @@ -372,6 +465,7 @@ dropRight: false, dropUp: false, selectedClass: 'active', + // Maximum height of the dropdown menu. // If maximum height is exceeded a scrollbar will be displayed. maxHeight: false, @@ -384,11 +478,13 @@ selectAllNumber: true, selectAllJustVisible: true, enableFiltering: false, + enableDiacriticsFiltering: false, enableCaseInsensitiveFiltering: false, enableFullValueFiltering: false, enableClickableOptGroups: false, enableCollapsibelOptGroups: false, filterPlaceholder: 'Search', + // possible options: 'text', 'value', 'both' filterBehavior: 'text', includeFilterClearBtn: true, @@ -416,7 +512,7 @@ /** * Builds the container of the multiselect. */ - buildContainer: function() { + buildContainer: function () { this.$container = $(this.options.buttonContainer); this.$container.on('show.bs.dropdown', this.options.onDropdownShow); this.$container.on('hide.bs.dropdown', this.options.onDropdownHide); @@ -427,16 +523,16 @@ /** * Builds the button of the multiselect. */ - buildButton: function() { + buildButton: function () { this.$button = $(this.options.templates.button).addClass(this.options.buttonClass); if (this.$select.attr('class') && this.options.inheritClass) { this.$button.addClass(this.$select.attr('class')); } + // Adopt active state. if (this.$select.prop('disabled')) { this.disable(); - } - else { + } else { this.enable(); } @@ -464,7 +560,7 @@ /** * Builds the ul representing the dropdown menu. */ - buildDropdown: function() { + buildDropdown: function () { // Build ul. this.$ul = $(this.options.templates.ul); @@ -482,12 +578,12 @@ 'overflow-x': 'hidden' }); } - + if (this.options.dropUp) { - - var height = Math.min(this.options.maxHeight, $('option[data-role!="divider"]', this.$select).length*26 + $('option[data-role="divider"]', this.$select).length*19 + (this.options.includeSelectAllOption ? 26 : 0) + (this.options.enableFiltering || this.options.enableCaseInsensitiveFiltering ? 44 : 0)); + + var height = Math.min(this.options.maxHeight, $('option[data-role!="divider"]', this.$select).length * 26 + $('option[data-role="divider"]', this.$select).length * 19 + (this.options.includeSelectAllOption ? 26 : 0) + (this.options.enableFiltering || this.options.enableCaseInsensitiveFiltering ? 44 : 0)); var moveCalc = height + 34; - + this.$ul.css({ 'max-height': height + 'px', 'overflow-y': 'auto', @@ -495,37 +591,36 @@ 'margin-top': "-" + moveCalc + 'px' }); } - + this.$container.append(this.$ul); }, /** * Build the dropdown options and binds all nessecary events. - * + * * Uses createDivider and createOptionValue to create the necessary options. */ - buildDropdownOptions: function() { + buildDropdownOptions: function () { - this.$select.children().each($.proxy(function(index, element) { + this.$select.children().each($.proxy(function (index, element) { var $element = $(element); + // 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); - } - else if (tag === 'option') { + } else if (tag === 'option') { if ($element.data('role') === 'divider') { this.createDivider(); - } - else { + } else { this.createOptionValue(element); } @@ -535,7 +630,7 @@ }, this)); // Bind the change event on the dropdown elements. - $('li input', this.$ul).on('change', $.proxy(function(event) { + $('li input', this.$ul).on('change', $.proxy(function (event) { var $target = $(event.target); var checked = $target.prop('checked') || false; @@ -546,8 +641,7 @@ if (checked) { $target.closest('li') .addClass(this.options.selectedClass); - } - else { + } else { $target.closest('li') .removeClass(this.options.selectedClass); } @@ -563,20 +657,17 @@ if (isSelectAllOption) { if (checked) { this.selectAll(this.options.selectAllJustVisible); - } - else { + } else { this.deselectAll(this.options.selectAllJustVisible); } - } - else { + } else { if (checked) { $option.prop('selected', true); if (this.options.multiple) { // Simply select additional option. $option.prop('selected', true); - } - else { + } else { // Unselect all other options and corresponding checkboxes. if (this.options.selectedClass) { $($checkboxesNotThis).closest('li').removeClass(this.options.selectedClass); @@ -592,12 +683,11 @@ if (this.options.selectedClass === "active") { $optionsNotThis.closest("a").css("outline", ""); } - } - else { + } else { // Unselect option. $option.prop('selected', false); } - + // To prevent select all from firing onChange: #575 this.options.onChange($option, checked); } @@ -607,25 +697,25 @@ this.updateButtonText(); this.updateSelectAll(); - if(this.options.preventInputChangeEvent) { + if (this.options.preventInputChangeEvent) { return false; } }, this)); - $('li a', this.$ul).on('mousedown', function(e) { + $('li a', this.$ul).on('mousedown', function (e) { if (e.shiftKey) { // Prevent selecting text by Shift+click return false; } }); - - $('li a', this.$ul).on('touchstart click', $.proxy(function(event) { + + $('li a', this.$ul).on('touchstart click', $.proxy(function (event) { event.stopPropagation(); var $target = $(event.target); - + if (event.shiftKey && this.options.multiple) { - if($target.is("label")){ // Handles checkbox selection manually (see https://github.com/davidstutz/bootstrap-multiselect/issues/431) + if ($target.is("label")) { // Handles checkbox selection manually (see https://github.com/davidstutz/bootstrap-multiselect/issues/431) event.preventDefault(); $target = $target.find("input"); $target.prop("checked", !$target.prop("checked")); @@ -635,41 +725,41 @@ if (this.lastToggledInput !== null && this.lastToggledInput !== $target) { // Make sure we actually have a range var from = $target.closest("li").index(); var to = this.lastToggledInput.closest("li").index(); - + if (from > to) { // Swap the indices var tmp = to; to = from; from = tmp; } - + // Make sure we grab all elements since slice excludes the last index ++to; - + // Change the checkboxes and underlying options var range = this.$ul.find("li").slice(from, to).find("input"); - + range.prop('checked', checked); - + if (this.options.selectedClass) { range.closest('li') .toggleClass(this.options.selectedClass, checked); } - + for (var i = 0, j = range.length; i < j; i++) { var $checkbox = $(range[i]); var $option = this.getOptionByValue($checkbox.val()); $option.prop('selected', checked); - } + } } - + // Trigger the select "change" event $target.trigger("change"); } - + // Remembers last clicked option - if($target.is("input") && !$target.closest("li").is(".multiselect-item")){ + if ($target.is("input") && !$target.closest("li").is(".multiselect-item")) { this.lastToggledInput = $target; } @@ -677,15 +767,14 @@ }, this)); // Keyboard support. - this.$container.off('keydown.multiselect').on('keydown.multiselect', $.proxy(function(event) { + this.$container.off('keydown.multiselect').on('keydown.multiselect', $.proxy(function (event) { if ($('input[type="text"]', this.$container).is(':focus')) { return; } if (event.keyCode === 9 && this.$container.hasClass('open')) { this.$button.click(); - } - else { + } else { var $items = $(this.$container).find("li:not(.divider):not(.disabled) a").filter(":visible"); if (!$items.length) { @@ -698,11 +787,11 @@ if (event.keyCode === 38 && index > 0) { index--; } + // Navigate down. else if (event.keyCode === 40 && index < $items.length - 1) { index++; - } - else if (!~index) { + } else if (!~index) { index = 0; } @@ -721,8 +810,8 @@ } }, this)); - if(this.options.enableClickableOptGroups && this.options.multiple) { - $('li.multiselect-group', this.$ul).on('click', $.proxy(function(event) { + if (this.options.enableClickableOptGroups && this.options.multiple) { + $('li.multiselect-group', this.$ul).on('click', $.proxy(function (event) { event.stopPropagation(); console.log('test'); var group = $(event.target).parent(); @@ -735,95 +824,94 @@ var allChecked = true; var optionInputs = $visibleOptions.find('input'); var values = []; - - optionInputs.each(function() { + + optionInputs.each(function () { allChecked = allChecked && $(this).prop('checked'); values.push($(this).val()); }); if (!allChecked) { this.select(values, false); - } - else { + } else { this.deselect(values, false); } - + this.options.onChange(optionInputs, !allChecked); - }, this)); + }, this)); } if (this.options.enableCollapsibleOptGroups && this.options.multiple) { $("li.multiselect-group input", this.$ul).off(); - $("li.multiselect-group", this.$ul).siblings().not("li.multiselect-group, li.multiselect-all", this.$ul).each( function () { + $("li.multiselect-group", this.$ul).siblings().not("li.multiselect-group, li.multiselect-all", this.$ul).each(function () { $(this).toggleClass('hidden', true); }); - - $("li.multiselect-group", this.$ul).on("click", $.proxy(function(group) { + + $("li.multiselect-group", this.$ul).on("click", $.proxy(function (group) { group.stopPropagation(); }, this)); - - $("li.multiselect-group > a > b", this.$ul).on("click", $.proxy(function(t) { + + $("li.multiselect-group > a > b", this.$ul).on("click", $.proxy(function (t) { t.stopPropagation(); var n = $(t.target).closest('li'); var r = n.nextUntil("li.multiselect-group"); var i = true; - - r.each(function() { + + r.each(function () { i = i && $(this).hasClass('hidden'); }); - + r.toggleClass('hidden', !i); }, this)); - - $("li.multiselect-group > a > input", this.$ul).on("change", $.proxy(function(t) { + + $("li.multiselect-group > a > input", this.$ul).on("change", $.proxy(function (t) { t.stopPropagation(); var n = $(t.target).closest('li'); var r = n.nextUntil("li.multiselect-group", ':not(.disabled)'); var s = r.find("input"); - + var i = true; - s.each(function() { + s.each(function () { i = i && $(this).prop("checked"); }); - + s.prop("checked", !i).trigger("change"); }, this)); - + // Set the initial selection state of the groups. - $('li.multiselect-group', this.$ul).each(function() { + $('li.multiselect-group', this.$ul).each(function () { var r = $(this).nextUntil("li.multiselect-group", ':not(.disabled)'); var s = r.find("input"); - + var i = true; - s.each(function() { + s.each(function () { i = i && $(this).prop("checked"); }); - + $(this).find('input').prop("checked", i); }); - + // Update the group checkbox based on new selections among the // corresponding children. - $("li input", this.$ul).on("change", $.proxy(function(t) { + $("li input", this.$ul).on("change", $.proxy(function (t) { t.stopPropagation(); var n = $(t.target).closest('li'); var r1 = n.prevUntil("li.multiselect-group", ':not(.disabled)'); var r2 = n.nextUntil("li.multiselect-group", ':not(.disabled)'); var s1 = r1.find("input"); var s2 = r2.find("input"); - + var i = $(t.target).prop('checked'); - s1.each(function() { + s1.each(function () { i = i && $(this).prop("checked"); }); - - s2.each(function() { + + s2.each(function () { i = i && $(this).prop("checked"); }); - + n.prevAll('.multiselect-group').find('input').prop('checked', i); }, this)); - + $("li.multiselect-all", this.$ul).css('background', '#f3f3f3').css('border-bottom', '1px solid #eaeaea'); $("li.multiselect-group > a, li.multiselect-all > a > label.checkbox", this.$ul).css('padding', '3px 20px 3px 35px'); $("li.multiselect-group > a > input", this.$ul).css('margin', '4px 0px 5px -20px'); @@ -835,7 +923,7 @@ * * @param {jQuery} element */ - createOptionValue: function(element) { + createOptionValue: function (element) { var $element = $(element); if ($element.is(':selected')) { $element.prop('selected', true); @@ -854,11 +942,10 @@ if (this.options.enableHTML) { $label.html(" " + label); - } - else { + } else { $label.text(" " + label); } - + var $checkbox = $('').attr('type', inputType); if (this.options.checkboxName) { @@ -901,7 +988,7 @@ * * @param {jQuery} element */ - createDivider: function(element) { + createDivider: function (element) { var $divider = $(this.options.templates.divider); this.$ul.append($divider); }, @@ -911,24 +998,23 @@ * * @param {jQuery} group */ - createOptgroup: function(group) { + createOptgroup: function (group) { if (this.options.enableCollapsibleOptGroups && this.options.multiple) { var label = $(group).attr("label"); var value = $(group).attr("value"); var r = $('
  • ' + label + '
    • '); if (this.options.enableClickableOptGroups) { - r.addClass("multiselect-group-clickable") + r.addClass("multiselect-group-clickable"); } this.$ul.append(r); if ($(group).is(":disabled")) { - r.addClass("disabled") + r.addClass("disabled"); } - $("option", group).each($.proxy(function($, group) { - this.createOptionValue(group) - }, this)) - } - else { + $("option", group).each($.proxy(function ($, group) { + this.createOptionValue(group); + }, this)); + } else { var groupName = $(group).prop('label'); // Add a header for the group. @@ -936,8 +1022,7 @@ if (this.options.enableHTML) { $('label', $li).html(groupName); - } - else { + } else { $('label', $li).text(groupName); } @@ -952,7 +1037,7 @@ } // Add the options of the group. - $('option', group).each($.proxy(function(index, element) { + $('option', group).each($.proxy(function (index, element) { this.createOptionValue(element); }, this)); } @@ -960,18 +1045,17 @@ /** * Build the select all. - * + * * Checks if a select all has already been created. */ - buildSelectAll: function() { + buildSelectAll: function () { if (typeof this.options.selectAllValue === 'number') { this.options.selectAllValue = this.options.selectAllValue.toString(); } - + var alreadyHasSelectAll = this.hasSelectAll(); - if (!alreadyHasSelectAll && this.options.includeSelectAllOption && this.options.multiple - && $('option', this.$select).length > this.options.includeSelectAllIfMoreThan) { + if (!alreadyHasSelectAll && this.options.includeSelectAllOption && this.options.multiple && $('option', this.$select).length > this.options.includeSelectAllIfMoreThan) { // Check whether to add a divider after the select all. if (this.options.includeSelectAllDivider) { @@ -980,21 +1064,19 @@ var $li = $(this.options.templates.li); $('label', $li).addClass("checkbox"); - + if (this.options.enableHTML) { $('label', $li).html(" " + this.options.selectAllText); - } - else { + } else { $('label', $li).text(" " + this.options.selectAllText); } - + if (this.options.selectAllName) { $('label', $li).prepend(''); - } - else { + } else { $('label', $li).prepend(''); } - + var $checkbox = $('input', $li); $checkbox.val(this.options.selectAllValue); @@ -1011,7 +1093,7 @@ /** * Builds the filter. */ - buildFilter: function() { + buildFilter: function () { // Build filter if filtering OR case insensitive filtering is enabled and the number of options exceeds (or equals) enableFilterLength. if (this.options.enableFiltering || this.options.enableCaseInsensitiveFiltering) { @@ -1021,11 +1103,11 @@ this.$filter = $(this.options.templates.filter); $('input', this.$filter).attr('placeholder', this.options.filterPlaceholder); - + // Adds optional filter clear button - if(this.options.includeFilterClearBtn){ + if (this.options.includeFilterClearBtn) { var clearBtn = $(this.options.templates.filterClearBtn); - clearBtn.on('click', $.proxy(function(event){ + clearBtn.on('click', $.proxy(function (event) { clearTimeout(this.searchTimeout); this.$filter.find('.multiselect-search').val(''); $('li', this.$ul).show().removeClass("filter-hidden"); @@ -1033,38 +1115,41 @@ }, this)); this.$filter.find('.input-group').append(clearBtn); } - + this.$ul.prepend(this.$filter); - this.$filter.val(this.query).on('click', function(event) { + this.$filter.val(this.query).on('click', function (event) { event.stopPropagation(); - }).on('input keydown', $.proxy(function(event) { + }).on('input keydown', $.proxy(function (event) { // Cancel enter key default behaviour if (event.which === 13) { - event.preventDefault(); + event.preventDefault(); } - + // This is useful to catch "keydown" events after the browser has updated the control. clearTimeout(this.searchTimeout); - this.searchTimeout = this.asyncFunction($.proxy(function() { + this.searchTimeout = this.asyncFunction($.proxy(function () { if (this.query !== event.target.value) { this.query = event.target.value; - var currentGroup, currentGroupVisible; - $.each($('li', this.$ul), $.proxy(function(index, element) { + var currentGroup; + var currentGroupVisible; + $.each($('li', this.$ul), $.proxy(function (index, element) { var value = $('input', element).length > 0 ? $('input', element).val() : ""; var text = $('label', element).text(); + if (this.options.enableDiacriticsFiltering) { + text = disableDiacritics(text); + } + var filterCandidate = ''; if ((this.options.filterBehavior === 'text')) { filterCandidate = text; - } - else if ((this.options.filterBehavior === 'value')) { + } else if ((this.options.filterBehavior === 'value')) { filterCandidate = value; - } - else if (this.options.filterBehavior === 'both') { + } else if (this.options.filterBehavior === 'both') { filterCandidate = text + '\n' + value; } @@ -1084,26 +1169,24 @@ if (this.query.indexOf(valueToMatch) > -1) { showElement = true; } - } - else if (filterCandidate.indexOf(this.query) > -1) { + } else if (filterCandidate.indexOf(this.query) > -1) { showElement = true; } // Toggle current element (group or group item) according to showElement boolean. $(element).toggle(showElement).toggleClass('filter-hidden', !showElement); - + // Differentiate groups and group items. if ($(element).hasClass('multiselect-group')) { // Remember group status. currentGroup = element; currentGroupVisible = showElement; - } - else { + } else { // Show group name when at least one of its items is visible. if (showElement) { $(currentGroup).show().removeClass('filter-hidden'); } - + // Show all group items when group name satisfies filter. if (!showElement && currentGroupVisible) { $(element).show().removeClass('filter-hidden'); @@ -1123,7 +1206,7 @@ /** * Unbinds the whole plugin. */ - destroy: function() { + destroy: function () { this.$container.remove(); this.$select.show(); this.$select.data('multiselect', null); @@ -1134,15 +1217,15 @@ */ refresh: function () { var inputs = $.map($('li input', this.$ul), $); - + $('option', this.$select).each($.proxy(function (index, element) { var $elem = $(element); var value = $elem.val(); var $input; for (var i = inputs.length; 0 < i--; /**/) { - if (value !== ($input = inputs[i]).val()) + if (value !== ($input = inputs[i]).val()) { continue; // wrong li - + } if ($elem.is(':selected')) { $input.prop('checked', true); @@ -1150,8 +1233,7 @@ $input.closest('li') .addClass(this.options.selectedClass); } - } - else { + } else { $input.prop('checked', false); if (this.options.selectedClass) { @@ -1165,8 +1247,7 @@ .prop('disabled', true) .closest('li') .addClass('disabled'); - } - else { + } else { $input.prop('disabled', false) .closest('li') .removeClass('disabled'); @@ -1181,15 +1262,15 @@ /** * Select all options of the given values. - * + * * If triggerOnChange is set to true, the on change event is triggered if * and only if one value is passed. - * + * * @param {Array} selectValues * @param {Boolean} triggerOnChange */ - select: function(selectValues, triggerOnChange) { - if(!$.isArray(selectValues)) { + select: function (selectValues, triggerOnChange) { + if (!$.isArray(selectValues)) { selectValues = [selectValues]; } @@ -1203,14 +1284,14 @@ var $option = this.getOptionByValue(value); var $checkbox = this.getInputByValue(value); - if($option === undefined || $checkbox === undefined) { + if ($option === undefined || $checkbox === undefined) { continue; } - + if (!this.options.multiple) { this.deselectAll(false); } - + if (this.options.selectedClass) { $checkbox.closest('li') .addClass(this.options.selectedClass); @@ -1218,7 +1299,7 @@ $checkbox.prop('checked', true); $option.prop('selected', true); - + if (triggerOnChange) { this.options.onChange($option, true); } @@ -1239,15 +1320,15 @@ /** * Deselects all options of the given values. - * + * * If triggerOnChange is set to true, the on change event is triggered, if * and only if one value is passed. - * + * * @param {Array} deselectValues * @param {Boolean} triggerOnChange */ - deselect: function(deselectValues, triggerOnChange) { - if(!$.isArray(deselectValues)) { + deselect: function (deselectValues, triggerOnChange) { + if (!$.isArray(deselectValues)) { deselectValues = [deselectValues]; } @@ -1261,7 +1342,7 @@ var $option = this.getOptionByValue(value); var $checkbox = this.getInputByValue(value); - if($option === undefined || $checkbox === undefined) { + if ($option === undefined || $checkbox === undefined) { continue; } @@ -1272,7 +1353,7 @@ $checkbox.prop('checked', false); $option.prop('selected', false); - + if (triggerOnChange) { this.options.onChange($option, false); } @@ -1281,7 +1362,7 @@ this.updateButtonText(); this.updateSelectAll(); }, - + /** * Selects all enabled & visible options. * @@ -1292,35 +1373,33 @@ */ selectAll: function (justVisible, triggerOnSelectAll) { justVisible = (this.options.enableCollapsibleOptGroups && this.options.multiple) ? false : justVisible; - + var justVisible = typeof justVisible === 'undefined' ? true : justVisible; var allCheckboxes = $("li input[type='checkbox']:enabled", this.$ul); var visibleCheckboxes = allCheckboxes.filter(":visible"); var allCheckboxesCount = allCheckboxes.length; var visibleCheckboxesCount = visibleCheckboxes.length; - - if(justVisible) { + + if (justVisible) { visibleCheckboxes.prop('checked', true); $("li:not(.divider):not(.disabled)", this.$ul).filter(":visible").addClass(this.options.selectedClass); - } - else { + } else { allCheckboxes.prop('checked', true); $("li:not(.divider):not(.disabled)", this.$ul).addClass(this.options.selectedClass); } - + if (allCheckboxesCount === visibleCheckboxesCount || justVisible === false) { $("option:not([data-role='divider']):enabled", this.$select).prop('selected', true); - } - else { - var values = visibleCheckboxes.map(function() { + } else { + var values = visibleCheckboxes.map(function () { return $(this).val(); }).get(); - - $("option:enabled", this.$select).filter(function(index) { + + $("option:enabled", this.$select).filter(function (index) { return $.inArray($(this).val(), values) !== -1; }).prop('selected', true); } - + if (triggerOnSelectAll) { this.options.onSelectAll(); } @@ -1328,35 +1407,34 @@ /** * Deselects all options. - * + * * If justVisible is true or not specified, only visible options are deselected. - * + * * @param {Boolean} justVisible */ deselectAll: function (justVisible) { justVisible = (this.options.enableCollapsibleOptGroups && this.options.multiple) ? false : justVisible; justVisible = typeof justVisible === 'undefined' ? true : justVisible; - - if(justVisible) { + + if (justVisible) { var visibleCheckboxes = $("li input[type='checkbox']:not(:disabled)", this.$ul).filter(":visible"); visibleCheckboxes.prop('checked', false); - - var values = visibleCheckboxes.map(function() { + + var values = visibleCheckboxes.map(function () { return $(this).val(); }).get(); - - $("option:enabled", this.$select).filter(function(index) { + + $("option:enabled", this.$select).filter(function (index) { return $.inArray($(this).val(), values) !== -1; }).prop('selected', false); - + if (this.options.selectedClass) { $("li:not(.divider):not(.disabled)", this.$ul).filter(":visible").removeClass(this.options.selectedClass); } - } - else { + } else { $("li input[type='checkbox']:enabled", this.$ul).prop('checked', false); $("option:enabled", this.$select).prop('selected', false); - + if (this.options.selectedClass) { $("li:not(.divider):not(.disabled)", this.$ul).removeClass(this.options.selectedClass); } @@ -1365,10 +1443,10 @@ /** * Rebuild the plugin. - * + * * Rebuilds the dropdown, the filter and the select all option. */ - rebuild: function() { + rebuild: function () { this.$ul.html(''); // Important to distinguish between radios and checkboxes. @@ -1380,14 +1458,13 @@ this.updateButtonText(); this.updateSelectAll(true); - + if (this.options.disableIfEmpty && $('option', this.$select).length <= 0) { this.disable(); - } - else { + } else { this.enable(); } - + if (this.options.dropRight) { this.$ul.addClass('pull-right'); } @@ -1396,23 +1473,23 @@ /** * The provided data will be used to build the dropdown. */ - dataprovider: function(dataprovider) { - + dataprovider: function (dataprovider) { + var groupCounter = 0; var $select = this.$select.empty(); - + $.each(dataprovider, function (index, option) { var $tag; - + if ($.isArray(option.children)) { // create optiongroup tag groupCounter++; - + $tag = $('').attr({ label: option.label || 'Group ' + groupCounter, disabled: !!option.disabled }); - - forEach(option.children, function(subOption) { // add children option tags + + forEach(option.children, function (subOption) { // add children option tags $tag.append($('