From 660643ae87b45ec619e2aac59a4f5156b6c70b93 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Fri, 28 Feb 2014 11:21:53 +0100 Subject: [PATCH 01/76] Fix a typo in the docs. --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index ec8af72c..b455439e 100644 --- a/select2.js +++ b/select2.js @@ -473,7 +473,7 @@ the specific language governing permissions and limitations under the Apache Lic * * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys. * - * If the object form is used ti is assumed that it contains 'data' and 'text' keys. The 'data' key should contain + * If the object form is used it is assumed that it contains 'data' and 'text' keys. The 'data' key should contain * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text' * key can either be a String in which case it is expected that each element in the 'data' array has a key with the * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract From 43e381ed3740ef5a72d3d2fa496dace89c9c1403 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 5 Mar 2014 21:02:06 -0500 Subject: [PATCH 02/76] Provide context for evaluated functions --- select2.js | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/select2.js b/select2.js index d5af816f..3f2c0c48 100644 --- a/select2.js +++ b/select2.js @@ -568,10 +568,18 @@ the specific language governing permissions and limitations under the Apache Lic throw new Error(formatterName +" must be a string, function, or falsy value"); } - function evaluate(val) { + /** + * Returns a given value + * If given a function, returns its output + * + * @param val string|function + * @param context value of "this" to be passed to function + * @returns {*} + */ + function evaluate(val, context) { if ($.isFunction(val)) { - var args = Array.prototype.slice.call(arguments, 1); - return val.apply(null, args); + var args = Array.prototype.slice.call(arguments, 2); + return val.apply(context, args); } return val; } @@ -700,8 +708,8 @@ the specific language governing permissions and limitations under the Apache Lic syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass); this.container.attr("style", opts.element.attr("style")); - this.container.css(evaluate(opts.containerCss)); - this.container.addClass(evaluate(opts.containerCssClass)); + this.container.css(evaluate(opts.containerCss, this.opts.element)); + this.container.addClass(evaluate(opts.containerCssClass, this.opts.element)); this.elementTabIndex = this.opts.element.attr("tabindex"); @@ -718,7 +726,7 @@ the specific language governing permissions and limitations under the Apache Lic syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass); - this.dropdown.addClass(evaluate(opts.dropdownCssClass)); + this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element)); this.dropdown.data("select2", this); this.dropdown.on("click", killEvent); @@ -1057,10 +1065,10 @@ the specific language governing permissions and limitations under the Apache Lic this.readonly(readonly); syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass); - this.container.addClass(evaluate(this.opts.containerCssClass)); + this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element)); syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass); - this.dropdown.addClass(evaluate(this.opts.dropdownCssClass)); + this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element)); }); @@ -1263,7 +1271,7 @@ the specific language governing permissions and limitations under the Apache Lic this.container.removeClass("select2-drop-above"); $dropdown.removeClass("select2-drop-above"); } - css = $.extend(css, evaluate(this.opts.dropdownCss)); + css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element)); $dropdown.css(css); }, @@ -1420,7 +1428,7 @@ the specific language governing permissions and limitations under the Apache Lic //abstract getMaximumSelectionSize: function() { - return evaluate(this.opts.maximumSelectionSize); + return evaluate(this.opts.maximumSelectionSize, this.opts.element); }, // abstract @@ -1570,7 +1578,7 @@ the specific language governing permissions and limitations under the Apache Lic self.postprocessResults(data, false, false); if (data.more===true) { - more.detach().appendTo(results).text(evaluate(self.opts.formatLoadMore, page+1)); + more.detach().appendTo(results).text(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)); window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10); } else { more.remove(); @@ -1638,14 +1646,14 @@ the specific language governing permissions and limitations under the Apache Lic if (maxSelSize >=1) { data = this.data(); if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) { - render("
  • " + evaluate(opts.formatSelectionTooBig, maxSelSize) + "
    • "); + render("
  • " + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "
    • "); return; } } if (search.val().length < opts.minimumInputLength) { if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) { - render("
  • " + evaluate(opts.formatInputTooShort, search.val(), opts.minimumInputLength) + "
    • "); + render("
  • " + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "
    • "); } else { render(""); } @@ -1655,7 +1663,7 @@ the specific language governing permissions and limitations under the Apache Lic if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) { if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) { - render("
  • " + evaluate(opts.formatInputTooLong, search.val(), opts.maximumInputLength) + "
    • "); + render("
  • " + evaluate(opts.formatInputTooLong, opts.element, search.val(), opts.maximumInputLength) + "
    • "); } else { render(""); } @@ -1663,7 +1671,7 @@ the specific language governing permissions and limitations under the Apache Lic } if (opts.formatSearching && this.findHighlightableChoices().length === 0) { - render("
  • " + evaluate(opts.formatSearching) + "
    • "); + render("
  • " + evaluate(opts.formatSearching, opts.element) + "
    • "); } search.addClass("select2-active"); @@ -1714,7 +1722,7 @@ the specific language governing permissions and limitations under the Apache Lic } if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) { - render("
  • " + evaluate(opts.formatNoMatches, search.val()) + "
    • "); + render("
  • " + evaluate(opts.formatNoMatches, opts.element, search.val()) + "
    • "); return; } @@ -1722,7 +1730,7 @@ the specific language governing permissions and limitations under the Apache Lic self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null}); if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) { - results.append("
  • " + self.opts.escapeMarkup(evaluate(opts.formatLoadMore, this.resultsPage)) + "
    • "); + results.append("
  • " + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "
    • "); window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10); } @@ -3046,7 +3054,7 @@ the specific language governing permissions and limitations under the Apache Lic if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){ if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) { if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) { - this.results.append("
  • " + evaluate(self.opts.formatNoMatches, self.search.val()) + "
    • "); + this.results.append("
  • " + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "
    • "); } } } From 3ce3ad7fb0ea09a9a311d3300f941ae575f66a0a Mon Sep 17 00:00:00 2001 From: David Foster Date: Tue, 1 Apr 2014 14:22:41 -0700 Subject: [PATCH 03/76] Allow an empty string to be used as the placeholder title. --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 3beb6420..9d314f0e 100644 --- a/select2.js +++ b/select2.js @@ -2219,7 +2219,7 @@ the specific language governing permissions and limitations under the Apache Lic isPlaceholderOptionSelected: function() { var placeholderOption; - if (!this.getPlaceholder()) return false; // no placeholder specified so no option should be considered + if (this.getPlaceholder() === undefined) return false; // no placeholder specified so no option should be considered return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected")) || (this.opts.element.val() === "") || (this.opts.element.val() === undefined) From c77e159178198376eed49a34ed224b163d7edec1 Mon Sep 17 00:00:00 2001 From: Anthony Dmitriyev Date: Thu, 3 Apr 2014 17:28:13 +0300 Subject: [PATCH 04/76] Another solution for clicks triggered on underlying elements --- select2.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index e850e591..f9107f29 100644 --- a/select2.js +++ b/select2.js @@ -735,11 +735,24 @@ the specific language governing permissions and limitations under the Apache Lic this.container.on("click", killEvent); installFilteredMouseMove(this.results); - this.dropdown.on("mousemove-filtered touchstart touchmove touchend", resultsSelector, this.bind(this.highlightUnderEvent)); - this.dropdown.on("touchend", resultsSelector, this.bind(this.selectHighlighted)); + + this.dropdown.on("mousemove-filtered", resultsSelector, this.bind(this.highlightUnderEvent)); + this.dropdown.on("touchstart touchmove touchend", resultsSelector, this.bind(function (event) { + this._touchEvent = true; + this.highlightUnderEvent(event); + })); this.dropdown.on("touchmove", resultsSelector, this.bind(this.touchMoved)); this.dropdown.on("touchstart touchend", resultsSelector, this.bind(this.clearTouchMoved)); + // Waiting for a click event on touch devices to select option and hide dropdown + // otherwise click will be triggered on an underlying element + this.dropdown.on('click', this.bind(function (event) { + if (this._touchEvent) { + this._touchEvent = false; + this.selectHighlighted(); + } + })); + installDebouncedScroll(80, this.results); this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded)); From 534bbff06ff46bd21d71700c833486524273c951 Mon Sep 17 00:00:00 2001 From: Hung Dao Date: Thu, 3 Apr 2014 17:06:08 -0700 Subject: [PATCH 05/76] trap touchstart touchend events within container --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index e850e591..802c2b76 100644 --- a/select2.js +++ b/select2.js @@ -777,7 +777,7 @@ the specific language governing permissions and limitations under the Apache Lic // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's // dom it will trigger the popup close, which is not what we want // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal. - this.dropdown.on("click mouseup mousedown focusin", function (e) { e.stopPropagation(); }); + this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); }); this.nextSearchTerm = undefined; From a6d7ecc27332e1c50c9aafdfe8b75c80a307eae4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 6 Apr 2014 17:29:45 +0200 Subject: [PATCH 06/76] Css dept-* rules should start with 1 no 0 --- select2.css | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/select2.css b/select2.css index 5be5476c..1e9c41bb 100644 --- a/select2.css +++ b/select2.css @@ -350,15 +350,13 @@ Version: @@ver@@ Timestamp: @@timestamp@@ user-select: none; } -.select2-results-dept-0 .select2-result-label { padding-left: 20px } -.select2-results-dept-1 .select2-result-label { padding-left: 40px } -.select2-results-dept-2 .select2-result-label { padding-left: 60px } -.select2-results-dept-3 .select2-result-label { padding-left: 80px } -.select2-results-dept-4 .select2-result-label { padding-left: 100px } -.select2-results-dept-5 .select2-result-label { padding-left: 110px } -.select2-results-dept-6 .select2-result-label { padding-left: 120px } - - +.select2-results-dept-1 .select2-result-label { padding-left: 20px } +.select2-results-dept-2 .select2-result-label { padding-left: 40px } +.select2-results-dept-3 .select2-result-label { padding-left: 60px } +.select2-results-dept-4 .select2-result-label { padding-left: 80px } +.select2-results-dept-5 .select2-result-label { padding-left: 100px } +.select2-results-dept-6 .select2-result-label { padding-left: 110px } +.select2-results-dept-7 .select2-result-label { padding-left: 120px } .select2-results .select2-highlighted { background: #3875d7; From 47005ede3ac3a9a20a4b30c93bdf855f7a4abbc6 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 9 Apr 2014 11:56:31 +0200 Subject: [PATCH 07/76] xhtml compatibility --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index f9107f29..5f5fc60c 100644 --- a/select2.js +++ b/select2.js @@ -1891,7 +1891,7 @@ the specific language governing permissions and limitations under the Apache Lic "class": "select2-container" }).html([ "", - "  ", + "  ", " ", "", "", From bdb8840fb421a8c154189282b4e165bb66916968 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 9 Apr 2014 12:36:43 +0200 Subject: [PATCH 08/76] Copy title attribute from original element --- select2.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/select2.js b/select2.js index f9107f29..0339d4ad 100644 --- a/select2.js +++ b/select2.js @@ -694,6 +694,8 @@ the specific language governing permissions and limitations under the Apache Lic this.containerSelector="#"+this.containerId; this.container.attr("id", this.containerId); + this.container.attr("title", opts.element.attr("title")); + // cache the body so future lookups are cheap this.body = thunk(function() { return opts.element.closest("body"); }); From 3f43f459e9c0f8d126b64437e41704ffa54fcb2b Mon Sep 17 00:00:00 2001 From: Eduardo Matos Date: Fri, 11 Apr 2014 14:02:11 -0300 Subject: [PATCH 09/76] Testing if the dropdown is opened before call positionDropdown, on events by resize, scroll and orientation --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 91892eee..9a927dc4 100644 --- a/select2.js +++ b/select2.js @@ -1390,7 +1390,7 @@ the specific language governing permissions and limitations under the Apache Lic var that = this; this.container.parents().add(window).each(function () { $(this).on(resize+" "+scroll+" "+orient, function (e) { - that.positionDropdown(); + if (!that.opened()) that.positionDropdown(); }); }); From 1a7a218922fd77a1e371e2eaf02d0e48706b57ff Mon Sep 17 00:00:00 2001 From: Thiago Talma Date: Sat, 12 Apr 2014 22:45:54 -0300 Subject: [PATCH 10/76] Update select2_locale_pt-BR.js Fix typo --- select2_locale_pt-BR.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2_locale_pt-BR.js b/select2_locale_pt-BR.js index d60b1827..ac4969ac 100644 --- a/select2_locale_pt-BR.js +++ b/select2_locale_pt-BR.js @@ -6,8 +6,8 @@ $.extend($.fn.select2.defaults, { formatNoMatches: function () { return "Nenhum resultado encontrado"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Informe " + n + " caractere" + (n == 1? "" : "s"); }, - formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caractere" + (n == 1? "" : "s"); }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Digite mais " + n + " caracter" + (n == 1? "" : "es"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caracter" + (n == 1? "" : "es"); }, formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; }, formatSearching: function () { return "Buscando…"; } From 759ccc93b6d2197a0faecce1bead4fd3eaa74a72 Mon Sep 17 00:00:00 2001 From: Dan Dascalescu Date: Mon, 14 Apr 2014 14:39:49 -0700 Subject: [PATCH 11/76] List Bootstrap 3 and Meteor integrations Since [bootstrap-tagsinput](https://github.com/TimSchlechter/bootstrap-tagsinput/issues/123) appears to be abandoned, Select2 seems like the best choice for Meteor. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8784c865..6767e48e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ Integrations * [Django](https://github.com/applegrew/django-select2) * [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin) * [Symfony2](https://github.com/avocode/FormExtensions) -* [Bootstrap](https://github.com/t0m/select2-bootstrap-css) (CSS skin) +* [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) +* [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) * [Yii](https://github.com/tonybolzan/yii-select2) Internationalization (i18n) From 143341b0a2e5a1bf2f9f32d0973c1003d1a80278 Mon Sep 17 00:00:00 2001 From: Dan Dascalescu Date: Mon, 14 Apr 2014 14:51:45 -0700 Subject: [PATCH 12/76] Mention CDN hosting --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8784c865..fa8f1ef7 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ Browser compatibility * Firefox 10+ * Safari 3+ * Opera 10.6+ + +Usage +----- +You can source Select2 directly from a [CDN like JSDliver](http://www.jsdelivr.com/#!select2), [download it from this GitHub repo](https://github.com/ivaynberg/select2/tags), or use one of the integrations below. Integrations ------------ From 7c9c9612b5c848a1923089f312e00bb2574c769f Mon Sep 17 00:00:00 2001 From: interestincode Date: Tue, 15 Apr 2014 02:08:16 -0700 Subject: [PATCH 13/76] Update select2.js As suggested in https://github.com/ivaynberg/select2/issues/781#issuecomment-38979100, significantly improves search speed, going from unusable to snappy on IE on a list of almost 10,000 items with a custom query limiting it to 25 results. Uses 'uni range + named function' from http://jsperf.com/diacritics/18 --- select2.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/select2.js b/select2.js index 55ab30be..b61b737f 100644 --- a/select2.js +++ b/select2.js @@ -114,16 +114,12 @@ the specific language governing permissions and limitations under the Apache Lic } function stripDiacritics(str) { - var ret, i, l, c; - - if (!str || str.length < 1) return str; - - ret = ""; - for (i = 0, l = str.length; i < l; i++) { - c = str.charAt(i); - ret += DIACRITICS[c] || c; + // Used 'uni range + named function' from http://jsperf.com/diacritics/18 + function match(a) { + return DIACRITICS[a] || a; } - return ret; + + return str.replace(/[^\u0000-\u007E]/g, match); } function indexOf(value, array) { From 22d503f8461ce5d47776f7676c833a0adf4c0de1 Mon Sep 17 00:00:00 2001 From: Eduardo Matos Date: Tue, 15 Apr 2014 10:51:23 -0300 Subject: [PATCH 14/76] Avoid call 'positionDropdown' function if the container it's closed --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 9a927dc4..e6406950 100644 --- a/select2.js +++ b/select2.js @@ -1390,7 +1390,7 @@ the specific language governing permissions and limitations under the Apache Lic var that = this; this.container.parents().add(window).each(function () { $(this).on(resize+" "+scroll+" "+orient, function (e) { - if (!that.opened()) that.positionDropdown(); + if (that.opened()) that.positionDropdown(); }); }); From 632595f53072624c7d2a83e095a8346781a5ef07 Mon Sep 17 00:00:00 2001 From: jorupp Date: Tue, 15 Apr 2014 16:36:24 -0500 Subject: [PATCH 15/76] Fix issue syncing CSS classes in IE9/10 --- select2.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/select2.js b/select2.js index b61b737f..869bd1ad 100644 --- a/select2.js +++ b/select2.js @@ -1079,9 +1079,13 @@ the specific language governing permissions and limitations under the Apache Lic }); - // IE8-10 - el.on("propertychange.select2", sync); - + // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener) + if (el.length && el[0].attachEvent) { + el.each(function() { + this.attachEvent("onpropertychange", sync); + }); + } + // hold onto a reference of the callback to work around a chromium bug if (this.mutationCallback === undefined) { this.mutationCallback = function (mutations) { From 42f2acd0aa004854edb3a933935a20ba3a295c3b Mon Sep 17 00:00:00 2001 From: Marc Schneider Date: Mon, 21 Apr 2014 00:18:19 +0200 Subject: [PATCH 16/76] Query term in tags function in select2 3.4 #2141 --- select2.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/select2.js b/select2.js index ea175cf7..a8e2cf9f 100644 --- a/select2.js +++ b/select2.js @@ -538,14 +538,17 @@ the specific language governing permissions and limitations under the Apache Lic var isFunc = $.isFunction(data); return function (query) { var t = query.term, filtered = {results: []}; - $(isFunc ? data() : data).each(function () { - var isObject = this.text !== undefined, - text = isObject ? this.text : this; - if (t === "" || query.matcher(t, text)) { - filtered.results.push(isObject ? this : {id: this, text: this}); - } - }); - query.callback(filtered); + var result = $(isFunc ? data(query) : data); + if ($.isArray(result)) { + $(isFunc ? data() : data).each(function () { + var isObject = this.text !== undefined, + text = isObject ? this.text : this; + if (t === "" || query.matcher(t, text)) { + filtered.results.push(isObject ? this : {id: this, text: this}); + } + }); + query.callback(filtered); + } }; } From ffddc48a24815f2b7176af2413d91905eaf3479a Mon Sep 17 00:00:00 2001 From: IliaFours Date: Tue, 22 Apr 2014 14:54:36 +0300 Subject: [PATCH 17/76] Recalculation dropdown height if dropdownAutoWidth is true --- select2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/select2.js b/select2.js index ea175cf7..da4a348c 100644 --- a/select2.js +++ b/select2.js @@ -1248,6 +1248,7 @@ the specific language governing permissions and limitations under the Apache Lic // Add scrollbar width to dropdown if vertical scrollbar is present dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width); dropWidth > width ? width = dropWidth : dropWidth = width; + dropHeight = $dropdown.outerHeight(false); enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight; } else { From 2e79f5eb4fd75464d255835374259ab762ba4c7a Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Sun, 20 Apr 2014 13:42:43 -0400 Subject: [PATCH 18/76] Only disable keyboard focusing for touch devices [Fixes #1541] This fixes the issue [1] by first checking to see if the current device is a touch device. The other issue [2] that occured because of the original fix [3] is now fixed, because the hidden inputs are always focused by default on non-touch devices. The code used for detecting touch devices was pulled from StackOverflow [4]. Information on the reasoning behind this fix can be found on GitHub [5]. [1]: https://github.com/ivaynberg/select2/issues/1541 [2]: https://github.com/ivaynberg/select2/issues/2223 [3]: https://github.com/ivaynberg/select2/commit/d87e93dd45ade99e7894ac4854bf65e8f59667d4 [4]: http://stackoverflow.com/a/15439809/359284 [5]: https://github.com/ivaynberg/select2/issues/1541#issuecomment-39805859 --- select2.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/select2.js b/select2.js index ea175cf7..4331225d 100644 --- a/select2.js +++ b/select2.js @@ -3384,6 +3384,15 @@ the specific language governing permissions and limitations under the Apache Lic searchInputPlaceholder: '', createSearchChoicePosition: 'top', shouldFocusInput: function (instance) { + // Attempt to detect touch devices + var supportsTouchEvents = (('ontouchstart' in window) || + (navigator.msMaxTouchPoints > 0)); + + // Only devices which support touch events should be special cased + if (!supportsTouchEvents) { + return true; + } + // Never focus the input if search is disabled if (instance.opts.minimumResultsForSearch < 0) { return false; From 6156abc2a882baf14d7b0f6e7ab01c0ce10c103d Mon Sep 17 00:00:00 2001 From: Justin Lei Date: Wed, 23 Apr 2014 17:13:21 -0700 Subject: [PATCH 19/76] Cleanup jQuery DOM elements on destroy --- select2.js | 65 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/select2.js b/select2.js index a8e2cf9f..36a91e42 100644 --- a/select2.js +++ b/select2.js @@ -234,20 +234,6 @@ the specific language governing permissions and limitations under the Apache Lic }; } - /** - * A simple implementation of a thunk - * @param formula function used to lazily initialize the thunk - * @return {Function} - */ - function thunk(formula) { - var evaluated = false, - value; - return function() { - if (evaluated === false) { value = formula(); evaluated = true; } - return value; - }; - }; - function installDebouncedScroll(threshold, element) { var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);}); element.on("scroll", function (e) { @@ -640,6 +626,15 @@ the specific language governing permissions and limitations under the Apache Lic if (original!==input) return input; } + function cleanupJQueryElements() { + var self = this; + + Array.prototype.forEach.call(arguments, function (element) { + self[element].remove(); + self[element] = null; + }); + } + /** * Creates a new class * @@ -695,8 +690,7 @@ the specific language governing permissions and limitations under the Apache Lic this.container.attr("title", opts.element.attr("title")); - // cache the body so future lookups are cheap - this.body = thunk(function() { return opts.element.closest("body"); }); + this.body = $("body"); syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass); @@ -832,7 +826,12 @@ the specific language governing permissions and limitations under the Apache Lic this.close(); - if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; } + if (this.propertyObserver) { + this.propertyObserver.disconnect(); + this.propertyObserver = null; + + this.mutationCallback = null; + } if (select2 !== undefined) { select2.container.remove(); @@ -850,6 +849,14 @@ the specific language governing permissions and limitations under the Apache Lic } element.show(); } + + cleanupJQueryElements.call(this, + "container", + "liveRegion", + "dropdown", + "results", + "search" + ); }, // abstract @@ -1258,11 +1265,11 @@ the specific language governing permissions and limitations under the Apache Lic } //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow); - //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove); + //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove); // fix positioning when body has an offset and is not position: static - if (this.body().css('position') !== 'static') { - bodyOffset = this.body().offset(); + if (this.body.css('position') !== 'static') { + bodyOffset = this.body.offset(); dropTop -= bodyOffset.top; dropLeft -= bodyOffset.left; } @@ -1344,8 +1351,8 @@ the specific language governing permissions and limitations under the Apache Lic this.clearDropdownAlignmentPreference(); - if(this.dropdown[0] !== this.body().children().last()[0]) { - this.dropdown.detach().appendTo(this.body()); + if(this.dropdown[0] !== this.body.children().last()[0]) { + this.dropdown.detach().appendTo(this.body); } // create the dropdown mask if doesn't already exist @@ -1354,7 +1361,7 @@ the specific language governing permissions and limitations under the Apache Lic mask = $(document.createElement("div")); mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask"); mask.hide(); - mask.appendTo(this.body()); + mask.appendTo(this.body); mask.on("mousedown touchstart click", function (e) { // Prevent IE from generating a click event on the body reinsertElement(mask); @@ -2009,6 +2016,11 @@ the specific language governing permissions and limitations under the Apache Lic $("label[for='" + this.focusser.attr('id') + "']") .attr('for', this.opts.element.attr("id")); this.parent.destroy.apply(this, arguments); + + cleanupJQueryElements.call(this, + "selection", + "focusser" + ); }, // single @@ -2090,7 +2102,7 @@ the specific language governing permissions and limitations under the Apache Lic this.search.on("blur", this.bind(function(e) { // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown. // without this the search field loses focus which is annoying - if (document.activeElement === this.body().get(0)) { + if (document.activeElement === this.body.get(0)) { window.setTimeout(this.bind(function() { if (this.opened()) { this.search.focus(); @@ -2599,6 +2611,11 @@ the specific language governing permissions and limitations under the Apache Lic $("label[for='" + this.search.attr('id') + "']") .attr('for', this.opts.element.attr("id")); this.parent.destroy.apply(this, arguments); + + cleanupJQueryElements.call(this, + "searchContainer", + "selection" + ); }, // multi From f9be3c039c281211865939e361cc2431a3d9c6ba Mon Sep 17 00:00:00 2001 From: Justin Lei Date: Wed, 23 Apr 2014 17:16:10 -0700 Subject: [PATCH 20/76] Issue 234368 for the Chromium project is fixed now (Issue #1099) --- select2.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/select2.js b/select2.js index 36a91e42..3771053a 100644 --- a/select2.js +++ b/select2.js @@ -829,8 +829,6 @@ the specific language governing permissions and limitations under the Apache Lic if (this.propertyObserver) { this.propertyObserver.disconnect(); this.propertyObserver = null; - - this.mutationCallback = null; } if (select2 !== undefined) { @@ -1096,18 +1094,13 @@ the specific language governing permissions and limitations under the Apache Lic }); } - // hold onto a reference of the callback to work around a chromium bug - if (this.mutationCallback === undefined) { - this.mutationCallback = function (mutations) { - mutations.forEach(sync); - } - } - // safari, chrome, firefox, IE11 observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver; if (observer !== undefined) { if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; } - this.propertyObserver = new observer(this.mutationCallback); + this.propertyObserver = new observer(function (mutations) { + mutations.forEach(sync); + }); this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false }); } }, From 47c1538e4e1940ae9a344ec59629add55473933f Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Sat, 26 Apr 2014 11:59:17 +0530 Subject: [PATCH 21/76] Yii 2.0 widget implementation Updated implementation for Yii 2.0 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5675326a..5377c31f 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ Integrations * [Symfony2](https://github.com/avocode/FormExtensions) * [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) * [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) -* [Yii](https://github.com/tonybolzan/yii-select2) +* [Yii 2.0](http://demos.krajee.com/widgets#select2) +* [Yii 1.1](https://github.com/tonybolzan/yii-select2) Internationalization (i18n) --------------------------- From 12d71426523c3452ae0aac334e214cdc7b465100 Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Sat, 26 Apr 2014 12:01:28 +0530 Subject: [PATCH 22/76] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5377c31f..f670c6ed 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ Integrations * [Symfony2](https://github.com/avocode/FormExtensions) * [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) * [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) -* [Yii 2.0](http://demos.krajee.com/widgets#select2) -* [Yii 1.1](https://github.com/tonybolzan/yii-select2) +* [Yii 2](http://demos.krajee.com/widgets#select2) +* [Yii 1](https://github.com/tonybolzan/yii-select2) Internationalization (i18n) --------------------------- From b5cdf552b1d091847d129121b198b9c6293a5b9f Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Sat, 26 Apr 2014 12:02:57 +0530 Subject: [PATCH 23/76] Yii 2.0 widget implementation Updated implementation for Yii framework 2.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f670c6ed..406fe79d 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ Integrations * [Symfony2](https://github.com/avocode/FormExtensions) * [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) * [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) -* [Yii 2](http://demos.krajee.com/widgets#select2) -* [Yii 1](https://github.com/tonybolzan/yii-select2) +* [Yii 2.x](http://demos.krajee.com/widgets#select2) +* [Yii 1.x](https://github.com/tonybolzan/yii-select2) Internationalization (i18n) --------------------------- From 3c1482ae45fbc7a0f40a841a7228a838277fdb9f Mon Sep 17 00:00:00 2001 From: marek Date: Mon, 28 Apr 2014 12:59:17 +0200 Subject: [PATCH 24/76] Replace dots with underscores in event handler names. Dots are processed in special way in jQuery on/off. --- select2.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/select2.js b/select2.js index 96c46f42..574be872 100644 --- a/select2.js +++ b/select2.js @@ -685,7 +685,9 @@ the specific language governing permissions and limitations under the Apache Lic .appendTo(document.body); this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid()).replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); - this.containerSelector="#"+this.containerId; + this.containerEventName= "s2id_" + (opts.element.attr("id") || "autogen"+nextUid()) + .replace(/([.])/g, '_') + .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); this.container.attr("id", this.containerId); this.container.attr("title", opts.element.attr("title")); @@ -1335,7 +1337,7 @@ the specific language governing permissions and limitations under the Apache Lic */ // abstract opening: function() { - var cid = this.containerId, + var cid = this.containerEventName, scroll = "scroll." + cid, resize = "resize."+cid, orient = "orientationchange."+cid, @@ -1407,7 +1409,7 @@ the specific language governing permissions and limitations under the Apache Lic close: function () { if (!this.opened()) return; - var cid = this.containerId, + var cid = this.containerEventName, scroll = "scroll." + cid, resize = "resize."+cid, orient = "orientationchange."+cid; From 97b897abe0e60d25712abaa0761bf76035e4d2cd Mon Sep 17 00:00:00 2001 From: marek Date: Mon, 28 Apr 2014 13:12:28 +0200 Subject: [PATCH 25/76] Set id in unescaped version. --- select2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index 574be872..5525b1ea 100644 --- a/select2.js +++ b/select2.js @@ -684,8 +684,8 @@ the specific language governing permissions and limitations under the Apache Lic .addClass("select2-hidden-accessible") .appendTo(document.body); - this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid()).replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); - this.containerEventName= "s2id_" + (opts.element.attr("id") || "autogen"+nextUid()) + this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid()); + this.containerEventName= this.containerId .replace(/([.])/g, '_') .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); this.container.attr("id", this.containerId); From e3751422f032dcba4273c85e3ccbfead2b1b703d Mon Sep 17 00:00:00 2001 From: Dawn Hammond Date: Mon, 28 Apr 2014 14:15:50 -0500 Subject: [PATCH 26/76] Fix focus issue when select-input has placeholder --- select2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/select2.js b/select2.js index 5525b1ea..8ff01902 100644 --- a/select2.js +++ b/select2.js @@ -2637,6 +2637,7 @@ the specific language governing permissions and limitations under the Apache Lic .attr('for', this.search.attr('id')); this.search.on("input paste", this.bind(function() { + if (this.search.attr('placeholder') && !this.search.val()) return; if (!this.isInterfaceEnabled()) return; if (!this.opened()) { this.open(); From 796661a11ddf6bef4d9ebbb776a07ea4065f000f Mon Sep 17 00:00:00 2001 From: Dawn Hammond Date: Mon, 28 Apr 2014 16:49:08 -0500 Subject: [PATCH 27/76] change condition to use length --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 8ff01902..b709d060 100644 --- a/select2.js +++ b/select2.js @@ -2637,7 +2637,7 @@ the specific language governing permissions and limitations under the Apache Lic .attr('for', this.search.attr('id')); this.search.on("input paste", this.bind(function() { - if (this.search.attr('placeholder') && !this.search.val()) return; + if (this.search.attr('placeholder') && this.search.val().length == 0) return; if (!this.isInterfaceEnabled()) return; if (!this.opened()) { this.open(); From c9019afe1fe6c34bcb1e956a022ad25c6d91ae8a Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 29 Apr 2014 19:47:20 +0200 Subject: [PATCH 28/76] Update French translation --- select2_locale_fr.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/select2_locale_fr.js b/select2_locale_fr.js index d8c87d4b..9afda2ab 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -5,9 +5,10 @@ "use strict"; $.extend($.fn.select2.defaults, { + formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; }, formatNoMatches: function () { return "Aucun résultat trouvé"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Merci de saisir " + n + " caractère" + (n == 1? "" : "s") + " de plus"; }, - formatInputTooLong: function (input, max) { var n = input.length - max; return "Merci de supprimer " + n + " caractère" + (n == 1? "" : "s"); }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Merci de saisir " + n + " caractère" + (n == 1 ? "" : "s") + " de plus"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Merci de supprimer " + n + " caractère" + (n == 1 ? "" : "s"); }, formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; }, formatSearching: function () { return "Recherche en cours…"; } From 0313630c5768986f09ab5eef4e855b48d24cbe62 Mon Sep 17 00:00:00 2001 From: Justin Lei Date: Tue, 29 Apr 2014 17:08:23 -0700 Subject: [PATCH 29/76] Unbind onpropertychange event handler on destroy for IE8-10 --- select2.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/select2.js b/select2.js index 5525b1ea..9531b663 100644 --- a/select2.js +++ b/select2.js @@ -828,10 +828,16 @@ the specific language governing permissions and limitations under the Apache Lic this.close(); + if (element.length && element[0].detachEvent) { + element.each(function () { + this.detachEvent("onpropertychange", this._sync); + }); + } if (this.propertyObserver) { this.propertyObserver.disconnect(); this.propertyObserver = null; } + this._sync = null; if (select2 !== undefined) { select2.container.remove(); @@ -1062,7 +1068,7 @@ the specific language governing permissions and limitations under the Apache Lic */ // abstract monitorSource: function () { - var el = this.opts.element, sync, observer; + var el = this.opts.element, observer; el.on("change.select2", this.bind(function (e) { if (this.opts.element.data("select2-change-triggered") !== true) { @@ -1070,7 +1076,7 @@ the specific language governing permissions and limitations under the Apache Lic } })); - sync = this.bind(function () { + this._sync = this.bind(function () { // sync enabled state var disabled = el.prop("disabled"); @@ -1092,7 +1098,7 @@ the specific language governing permissions and limitations under the Apache Lic // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener) if (el.length && el[0].attachEvent) { el.each(function() { - this.attachEvent("onpropertychange", sync); + this.attachEvent("onpropertychange", this._sync); }); } @@ -1101,7 +1107,7 @@ the specific language governing permissions and limitations under the Apache Lic if (observer !== undefined) { if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; } this.propertyObserver = new observer(function (mutations) { - mutations.forEach(sync); + mutations.forEach(this._sync); }); this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false }); } From e9ed6b918239511d994d45bad4811f5433b9af09 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Wed, 30 Apr 2014 19:28:04 -0400 Subject: [PATCH 30/76] modified version identifiers in descriptors for release 3.4.7 --- bower.json | 2 +- component.json | 2 +- composer.json | 2 +- package.json | 2 +- select2.jquery.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index e8ea7808..7e167aaf 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "select2", - "version": "3.4.6", + "version": "3.4.7", "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"], "dependencies": { "jquery": ">= 1.7.1" diff --git a/component.json b/component.json index 4a747f27..8a935279 100644 --- a/component.json +++ b/component.json @@ -2,7 +2,7 @@ "name": "select2", "repo": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "version": "3.4.6", + "version": "3.4.7", "demo": "http://ivaynberg.github.io/select2/", "keywords": [ "jquery" diff --git a/composer.json b/composer.json index ab2e2b72..8ed0a456 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes.", - "version": "3.4.6", + "version": "3.4.7", "type": "component", "homepage": "http://ivaynberg.github.io/select2/", "license": "Apache-2.0", diff --git a/package.json b/package.json index 065dbc9b..f84be8a5 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Igor Vaynberg", "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"}, "main": "select2.js", - "version": "3.4.6", + "version": "3.4.7", "jspm": { "main": "select2", "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"], diff --git a/select2.jquery.json b/select2.jquery.json index 1407f552..e7e611f6 100644 --- a/select2.jquery.json +++ b/select2.jquery.json @@ -11,7 +11,7 @@ "tag", "tagging" ], - "version": "3.4.6", + "version": "3.4.7", "author": { "name": "Igor Vaynberg", "url": "https://github.com/ivaynberg" From ca859e4e42c17a01d58215232132386e5ca8a413 Mon Sep 17 00:00:00 2001 From: Marc Schneider Date: Thu, 1 May 2014 15:35:32 +0200 Subject: [PATCH 31/76] Query term in tags function in select2 3.4 #2141 --- select2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index a8e2cf9f..4f7fc99e 100644 --- a/select2.js +++ b/select2.js @@ -538,9 +538,9 @@ the specific language governing permissions and limitations under the Apache Lic var isFunc = $.isFunction(data); return function (query) { var t = query.term, filtered = {results: []}; - var result = $(isFunc ? data(query) : data); + var result = isFunc ? data(query) : data; if ($.isArray(result)) { - $(isFunc ? data() : data).each(function () { + $(result).each(function () { var isObject = this.text !== undefined, text = isObject ? this.text : this; if (t === "" || query.matcher(t, text)) { From 0db21bb26d4b5bc30a645df84375262f533599d1 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Thu, 1 May 2014 09:50:32 -0400 Subject: [PATCH 32/76] modified version identifiers in descriptors for release 3.4.8 --- bower.json | 2 +- component.json | 2 +- composer.json | 2 +- package.json | 2 +- select2.jquery.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 7e167aaf..80e8596e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "select2", - "version": "3.4.7", + "version": "3.4.8", "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"], "dependencies": { "jquery": ">= 1.7.1" diff --git a/component.json b/component.json index 8a935279..ad7abf9d 100644 --- a/component.json +++ b/component.json @@ -2,7 +2,7 @@ "name": "select2", "repo": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "version": "3.4.7", + "version": "3.4.8", "demo": "http://ivaynberg.github.io/select2/", "keywords": [ "jquery" diff --git a/composer.json b/composer.json index 8ed0a456..c50fadba 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes.", - "version": "3.4.7", + "version": "3.4.8", "type": "component", "homepage": "http://ivaynberg.github.io/select2/", "license": "Apache-2.0", diff --git a/package.json b/package.json index f84be8a5..75ad84ac 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Igor Vaynberg", "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"}, "main": "select2.js", - "version": "3.4.7", + "version": "3.4.8", "jspm": { "main": "select2", "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"], diff --git a/select2.jquery.json b/select2.jquery.json index e7e611f6..e9119279 100644 --- a/select2.jquery.json +++ b/select2.jquery.json @@ -11,7 +11,7 @@ "tag", "tagging" ], - "version": "3.4.7", + "version": "3.4.8", "author": { "name": "Igor Vaynberg", "url": "https://github.com/ivaynberg" From 2133129a7419b446d4c1397625fcfb5fb9a7d9dd Mon Sep 17 00:00:00 2001 From: "Braden M. Kelley" Date: Thu, 1 May 2014 08:54:32 -0700 Subject: [PATCH 33/76] keyword `this` inside closures referring to wrong object --- select2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/select2.js b/select2.js index 682baa88..c5d1eca6 100644 --- a/select2.js +++ b/select2.js @@ -1076,7 +1076,7 @@ the specific language governing permissions and limitations under the Apache Lic */ // abstract monitorSource: function () { - var el = this.opts.element, observer; + var el = this.opts.element, observer, self = this; el.on("change.select2", this.bind(function (e) { if (this.opts.element.data("select2-change-triggered") !== true) { @@ -1106,7 +1106,7 @@ the specific language governing permissions and limitations under the Apache Lic // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener) if (el.length && el[0].attachEvent) { el.each(function() { - this.attachEvent("onpropertychange", this._sync); + this.attachEvent("onpropertychange", self._sync); }); } @@ -1115,7 +1115,7 @@ the specific language governing permissions and limitations under the Apache Lic if (observer !== undefined) { if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; } this.propertyObserver = new observer(function (mutations) { - mutations.forEach(this._sync); + mutations.forEach(self._sync); }); this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false }); } From 344a4b19e2671b6da31b2a568d63d733784a7b46 Mon Sep 17 00:00:00 2001 From: seferov Date: Sat, 3 May 2014 10:22:54 +0300 Subject: [PATCH 34/76] Azerbaijani translation added. --- select2_locale_az.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 select2_locale_az.js diff --git a/select2_locale_az.js b/select2_locale_az.js new file mode 100644 index 00000000..23c53cb5 --- /dev/null +++ b/select2_locale_az.js @@ -0,0 +1,18 @@ +/** + * Select2 Azerbaijani translation. + * + * Author: Farhad Safarov + */ +(function ($) { + "use strict"; + + $.extend($.fn.select2.defaults, { + formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; }, + formatNoMatches: function () { return "Nəticə tapılmadı"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return n + " simvol daxil edin"; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return n + " simvol silin"; }, + formatSelectionTooBig: function (limit) { return "Sadəcə " + limit + " element seçə bilərsiniz"; }, + formatLoadMore: function (pageNumber) { return "Daha çox nəticə yüklənir…"; }, + formatSearching: function () { return "Axtarılır…"; } + }); +})(jQuery); From d4fb3a3b00175acb17d372aa3ac53d5e37763cae Mon Sep 17 00:00:00 2001 From: seferov Date: Sat, 3 May 2014 10:24:13 +0300 Subject: [PATCH 35/76] typo fixed --- select2_locale_az.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2_locale_az.js b/select2_locale_az.js index 23c53cb5..f0af5092 100644 --- a/select2_locale_az.js +++ b/select2_locale_az.js @@ -7,7 +7,7 @@ "use strict"; $.extend($.fn.select2.defaults, { - formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; }, + formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; }, formatNoMatches: function () { return "Nəticə tapılmadı"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return n + " simvol daxil edin"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return n + " simvol silin"; }, From 7bf2f2eb752d5d2376474dacd8d609789b0ee5d1 Mon Sep 17 00:00:00 2001 From: sroe Date: Tue, 6 May 2014 10:41:08 +0200 Subject: [PATCH 36/76] formatMatches translation added formatMatches translation added. --- select2_locale_de.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/select2_locale_de.js b/select2_locale_de.js index 93b18e81..ee971ac4 100644 --- a/select2_locale_de.js +++ b/select2_locale_de.js @@ -10,6 +10,7 @@ formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; }, formatSelectionTooBig: function (limit) { return "Sie können nur " + limit + " Eintr" + (limit === 1 ? "ag" : "äge") + " auswählen"; }, formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; }, - formatSearching: function () { return "Suche…"; } + formatSearching: function () { return "Suche…"; }, + formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; } }); -})(jQuery); \ No newline at end of file +})(jQuery); From 09003853e4f02db9ccc9b09da9bbc3b703062f99 Mon Sep 17 00:00:00 2001 From: Soichi Hayashi Date: Wed, 7 May 2014 17:24:07 +0000 Subject: [PATCH 37/76] Fixed the issue where multi-line item inside multi list will touch the right end of the container --- select2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.css b/select2.css index 1e9c41bb..34ed53bb 100644 --- a/select2.css +++ b/select2.css @@ -440,7 +440,7 @@ disabled look for disabled choices in the results dropdown height: auto !important; height: 1%; margin: 0; - padding: 0; + padding: 0 5px 0 0; position: relative; border: 1px solid #aaa; From c37640720e2f19324566f5a1ab63a4945881d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= Date: Tue, 4 Feb 2014 16:32:13 +0100 Subject: [PATCH 38/76] Improve French translation --- select2_locale_fr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2_locale_fr.js b/select2_locale_fr.js index 9afda2ab..110854f8 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -7,8 +7,8 @@ $.extend($.fn.select2.defaults, { formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; }, formatNoMatches: function () { return "Aucun résultat trouvé"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Merci de saisir " + n + " caractère" + (n == 1 ? "" : "s") + " de plus"; }, - formatInputTooLong: function (input, max) { var n = input.length - max; return "Merci de supprimer " + n + " caractère" + (n == 1 ? "" : "s"); }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Saisissez " + n + " caractère" + (n == 1? "" : "s") + " supplémentaire" + (n == 1? "" : "s") ; }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Supprimez " + n + " caractère" + (n == 1? "" : "s"); }, formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; }, formatSearching: function () { return "Recherche en cours…"; } From 1d26b2bc17c112f0f6f30c95ca0f7378bfb28cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= Date: Tue, 4 Feb 2014 16:32:36 +0100 Subject: [PATCH 39/76] Remove execution flags on select2_locale_zh-TW.js --- select2_locale_zh-TW.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 select2_locale_zh-TW.js diff --git a/select2_locale_zh-TW.js b/select2_locale_zh-TW.js old mode 100755 new mode 100644 From 00bad439bc47bd503305d3b1f37599e653ab34f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= Date: Tue, 4 Feb 2014 16:49:51 +0100 Subject: [PATCH 40/76] Add note about position of locale file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 406fe79d..3964bd22 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ Integrations Internationalization (i18n) --------------------------- -Select2 supports multiple languages by simply including the right -language JS file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.). +Select2 supports multiple languages by simply including the right language JS +file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.) after `select2.js`. Missing a language? Just copy `select2_locale_en.js.template`, translate it, and make a pull request back to Select2 here on GitHub. From 12e0de21ae4d753eee3950be9b95848a82df6f15 Mon Sep 17 00:00:00 2001 From: ycdtosa Date: Mon, 12 May 2014 11:39:54 +0200 Subject: [PATCH 41/76] changes on updateResults, populate by @cervengoc on #781 use string concatenation instead of DOM manipulation at populate. This does gives about a 45% speed boost as measured with chrome v35. Code by @cervengoc on #781 --- select2.js | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/select2.js b/select2.js index 580d32ed..de25c8b2 100644 --- a/select2.js +++ b/select2.js @@ -919,39 +919,46 @@ the specific language governing permissions and limitations under the Apache Lic populate=function(results, container, depth) { - var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted; + var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted, formattedClass; results = opts.sortResults(results, container, query); + // collect the created nodes for bulk append + var nodes = []; for (i = 0, l = results.length; i < l; i = i + 1) { result=results[i]; - disabled = (result.disabled === true); selectable = (!disabled) && (id(result) !== undefined); - compound=result.children && result.children.length > 0; - node=$("
  • "); - node.addClass("select2-results-dept-"+depth); - node.addClass("select2-result"); - node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable"); - if (disabled) { node.addClass("select2-disabled"); } - if (compound) { node.addClass("select2-result-with-children"); } - node.addClass(self.opts.formatResultCssClass(result)); - node.attr("role", "presentation"); + node ="
  • "; - label=$(document.createElement("div")); - label.addClass("select2-result-label"); - label.attr("id", "select2-result-label-" + nextUid()); - label.attr("role", "option"); + label = "
    Date: Mon, 12 May 2014 15:34:40 +0200 Subject: [PATCH 42/76] Better support for RTL languages CSS changes to better support RTL languages. Most notable is the positioning of the arrow on the left side of the select2 for RTL --- select2.css | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/select2.css b/select2.css index 34ed53bb..d1f56073 100644 --- a/select2.css +++ b/select2.css @@ -56,6 +56,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@ background-image: linear-gradient(to top, #eee 0%, #fff 50%); } +html[dir="rtl"] .select2-container .select2-choice { + padding: 0 8px 0 0; +} + .select2-container.select2-drop-above .select2-choice { border-bottom-color: #aaa; @@ -84,6 +88,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@ width: auto; } +html[dir="rtl"] .select2-container .select2-choice > .select2-chosen { + margin-left: 26px; + margin-right: 0; +} + .select2-container .select2-choice abbr { display: none; width: 12px; @@ -196,6 +205,15 @@ Version: @@ver@@ Timestamp: @@timestamp@@ background-image: linear-gradient(to top, #ccc 0%, #eee 60%); } +html[dir="rtl"] .select2-container .select2-choice .select2-arrow { + left: 0; + right: auto; + + border-left: none; + border-right: 1px solid #aaa; + border-radius: 4px 0 0 4px; +} + .select2-container .select2-choice .select2-arrow b { display: block; width: 100%; @@ -203,6 +221,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@ background: url('select2.png') no-repeat 0 1px; } +html[dir="rtl"] .select2-container .select2-choice .select2-arrow b { + background-position: 2px 1px; +} + .select2-search { display: inline-block; width: 100%; @@ -241,6 +263,16 @@ Version: @@ver@@ Timestamp: @@timestamp@@ background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; } +html[dir="rtl"] .select2-search input { + padding: 4px 5px 4px 20px; + + background: #fff url('select2.png') no-repeat -37px -22px; + background: url('select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0; +} + .select2-drop.select2-drop-above .select2-search input { margin-top: 4px; } @@ -295,10 +327,18 @@ Version: @@ver@@ Timestamp: @@timestamp@@ border-left: none; filter: none; } +html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow { + border-right: none; +} + .select2-dropdown-open .select2-choice .select2-arrow b { background-position: -18px 1px; } +html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow b { + background-position: -16px 1px; +} + .select2-hidden-accessible { border: 0; clip: rect(0 0 0 0); @@ -321,6 +361,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@ -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } +html[dir="rtl"] .select2-results { + padding: 0 4px 0 0; + margin: 4px 0 4px 4px; +} + .select2-results ul.select2-result-sub { margin: 0; padding-left: 0; From f07bab5a6b4daff60b24c11a2c4a9be4637a4533 Mon Sep 17 00:00:00 2001 From: thereloaded Date: Mon, 12 May 2014 19:35:59 +0200 Subject: [PATCH 43/76] query as third parameter to ajax results callback for e.g. proper cache implementation it is necessary to have the complete query in the results callback of the ajax function. to not break backwards compatibility i added it as third parameter and did not replace query.page parameter --- select2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 580d32ed..49132d01 100644 --- a/select2.js +++ b/select2.js @@ -438,7 +438,8 @@ the specific language governing permissions and limitations under the Apache Lic data: data, success: function (data) { // TODO - replace query.page with query so users have access to term, page, etc. - var results = options.results(data, query.page); + // added query as third paramter to keep backwards compatibility + var results = options.results(data, query.page, query); query.callback(results); } }); From fb91adaa57705efee1893cb236c574b3c0386e47 Mon Sep 17 00:00:00 2001 From: Robert-Jan Bijl Date: Tue, 13 May 2014 08:44:20 +0200 Subject: [PATCH 44/76] More RTL style fixes, now for the multiple select --- select2.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/select2.css b/select2.css index d1f56073..90c73aa1 100644 --- a/select2.css +++ b/select2.css @@ -499,6 +499,10 @@ disabled look for disabled choices in the results dropdown background-image: linear-gradient(to bottom, #eee 1%, #fff 15%); } +html[dir="rtl"] .select2-container-multi .select2-choices { + padding: 0 0 0 5px; +} + .select2-locked { padding: 3px 5px 3px 5px !important; } @@ -582,8 +586,8 @@ html[dir="rtl"] .select2-container-multi .select2-choices li } html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice { - margin-left: 0; - margin-right: 5px; + margin: 3px 5px 3px 0; + padding: 3px 18px 3px 5px; } .select2-container-multi .select2-choices .select2-search-choice .select2-chosen { cursor: default; @@ -613,6 +617,11 @@ html[dir="rtl"] .select2-search-choice-close { left: 3px; } +html[dir="rtl"] .select2-container-multi .select2-search-choice-close { + left: auto; + right: 3px; +} + .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { background-position: right -11px; } From 5470a453f911cf2b71cc05ae52d86eddd1a43b5d Mon Sep 17 00:00:00 2001 From: Robert-Jan Bijl Date: Tue, 13 May 2014 09:05:37 +0200 Subject: [PATCH 45/76] Getting a few more pixels perfect in the RTL mode for multiple selects --- select2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.css b/select2.css index 90c73aa1..df8b9fcc 100644 --- a/select2.css +++ b/select2.css @@ -619,7 +619,7 @@ html[dir="rtl"] .select2-search-choice-close { html[dir="rtl"] .select2-container-multi .select2-search-choice-close { left: auto; - right: 3px; + right: 2px; } .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { From 49a86e21ed8d7a95f7e2a62f675573d0d57ae2f8 Mon Sep 17 00:00:00 2001 From: thereloaded Date: Tue, 13 May 2014 09:34:16 +0200 Subject: [PATCH 46/76] added query to function head jsdoc block --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 49132d01..3f2ea21b 100644 --- a/select2.js +++ b/select2.js @@ -391,7 +391,7 @@ the specific language governing permissions and limitations under the Apache Lic * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url. * @param options.dataType request data type: ajax, jsonp, other datatypes supported by jQuery's $.ajax function or the transport function if specified * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often - * @param options.results a function(remoteData, pageNumber) that converts data returned form the remote request to the format expected by Select2. + * @param options.results a function(remoteData, pageNumber, query) that converts data returned form the remote request to the format expected by Select2. * The expected format is an object containing the following keys: * results array of objects that will be used as choices * more (optional) boolean indicating whether there are more results available From c14f45cb6c62e452f3b9bed3b12dea0c19dd849e Mon Sep 17 00:00:00 2001 From: ycdtosa Date: Tue, 13 May 2014 09:54:00 +0200 Subject: [PATCH 47/76] Revert "changes on updateResults, populate by @cervengoc on #781" This reverts commit 12e0de21ae4d753eee3950be9b95848a82df6f15. --- select2.js | 52 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/select2.js b/select2.js index de25c8b2..580d32ed 100644 --- a/select2.js +++ b/select2.js @@ -919,46 +919,39 @@ the specific language governing permissions and limitations under the Apache Lic populate=function(results, container, depth) { - var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted, formattedClass; + var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted; results = opts.sortResults(results, container, query); - // collect the created nodes for bulk append - var nodes = []; for (i = 0, l = results.length; i < l; i = i + 1) { result=results[i]; + disabled = (result.disabled === true); selectable = (!disabled) && (id(result) !== undefined); + compound=result.children && result.children.length > 0; - node ="
  • "; + node=$("
  • "); + node.addClass("select2-results-dept-"+depth); + node.addClass("select2-result"); + node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable"); + if (disabled) { node.addClass("select2-disabled"); } + if (compound) { node.addClass("select2-result-with-children"); } + node.addClass(self.opts.formatResultCssClass(result)); + node.attr("role", "presentation"); - label = "
    Date: Tue, 13 May 2014 12:27:31 +0200 Subject: [PATCH 48/76] update populate at formatResults to use bulk append of nodes this will make a small (25%) improvement on speed. --- select2.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 580d32ed..49abd8a1 100644 --- a/select2.js +++ b/select2.js @@ -923,6 +923,8 @@ the specific language governing permissions and limitations under the Apache Lic results = opts.sortResults(results, container, query); + // collect the created nodes for bulk append + var nodes = []; for (i = 0, l = results.length; i < l; i = i + 1) { result=results[i]; @@ -962,9 +964,11 @@ the specific language governing permissions and limitations under the Apache Lic } node.data("select2-data", result); - container.append(node); + nodes.push(node[0]); } + // bulk append the created nodes + container.append(nodes); liveRegion.text(opts.formatMatches(results.length)); }; From df43e1a1ec2e302f7887fc57ecd36e65cb1b04be Mon Sep 17 00:00:00 2001 From: George Schizas Date: Tue, 13 May 2014 16:59:41 +0300 Subject: [PATCH 49/76] fixed word wrapping for DIACRITICS variable --- select2.js | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 580d32ed..fc6d4f4f 100644 --- a/select2.js +++ b/select2.js @@ -98,7 +98,134 @@ the specific language governing permissions and limitations under the Apache Lic }, MEASURE_SCROLLBAR_TEMPLATE = "
    ", - DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z"}; + DIACRITICS = { + "\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A", + "\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A", + "\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A", + "\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A", + "\u2C6F":"A", + "\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV", + "\uA73C":"AY", + "\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B", + "\u24B8":"C", + "\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C", + "\u023B":"C","\uA73E":"C", + "\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D", + "\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D", + "\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz", + "\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E", + "\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E", + "\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E", + "\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E", + "\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F", + "\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G", + "\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G", + "\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H", + "\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H", + "\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I", + "\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I", + "\u012E":"I","\u1E2C":"I","\u0197":"I", + "\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J", + "\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K", + "\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K", + "\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L", + "\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L", + "\uA780":"L", + "\u01C7":"LJ","\u01C8":"Lj", + "\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M", + "\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N", + "\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N", + "\u01CA":"NJ","\u01CB":"Nj", + "\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O", + "\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O", + "\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O", + "\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O", + "\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O", + "\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU", + "\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P", + "\uA754":"P", + "\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q", + "\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R", + "\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R", + "\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S", + "\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S", + "\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T", + "\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ", + "\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U", + "\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U", + "\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U", + "\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U", + "\u0244":"U", + "\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY", + "\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W", + "\u2C72":"W", + "\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X", + "\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y", + "\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y", + "\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z", + "\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z", + "\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a", + "\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a", + "\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a", + "\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a", + "\u2C65":"a","\u0250":"a", + "\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av", + "\uA73D":"ay", + "\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b", + "\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c", + "\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c", + "\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d", + "\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz", + "\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e", + "\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e", + "\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e", + "\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e", + "\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f", + "\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g", + "\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g", + "\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h", + "\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv", + "\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i", + "\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i", + "\u1E2D":"i","\u0268":"i","\u0131":"i", + "\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j", + "\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k", + "\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k", + "\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l", + "\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l", + "\uA781":"l","\uA747":"l","\u01C9":"lj", + "\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m", + "\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n", + "\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n", + "\u01CC":"nj", + "\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o", + "\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o", + "\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o", + "\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o", + "\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o", + "\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo", + "\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p", + "\uA755":"p", + "\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q", + "\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r", + "\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r", + "\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s", + "\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s", + "\u1E9B":"s", + "\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t", + "\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz", + "\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u", + "\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u", + "\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u", + "\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u", + "\u0289":"u", + "\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy", + "\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w", + "\u1E89":"w","\u2C73":"w", + "\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y", + "\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y", + "\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z", + "\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z"}; $document = $(document); From 68c64a112985b084f9553dca4d231a9aca60ba37 Mon Sep 17 00:00:00 2001 From: George Schizas Date: Tue, 13 May 2014 17:05:46 +0300 Subject: [PATCH 50/76] Enabled Greek for diacritics ignoring --- select2.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/select2.js b/select2.js index fc6d4f4f..d591e6d0 100644 --- a/select2.js +++ b/select2.js @@ -225,7 +225,13 @@ the specific language governing permissions and limitations under the Apache Lic "\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y", "\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y", "\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z", - "\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z"}; + "\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z", + "\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399", + "\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5", + "\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7", + "\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF", + "\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9", + "\u03C2":"\u03C3"} $document = $(document); From 827a549ba80e79c30c0b70c1fa70870810ec11cb Mon Sep 17 00:00:00 2001 From: George Schizas Date: Tue, 13 May 2014 17:11:14 +0300 Subject: [PATCH 51/76] Reverted formatting of diacritics variable, now is again in one line --- select2.js | 135 +---------------------------------------------------- 1 file changed, 1 insertion(+), 134 deletions(-) diff --git a/select2.js b/select2.js index d591e6d0..b261332b 100644 --- a/select2.js +++ b/select2.js @@ -98,140 +98,7 @@ the specific language governing permissions and limitations under the Apache Lic }, MEASURE_SCROLLBAR_TEMPLATE = "
    ", - DIACRITICS = { - "\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A", - "\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A", - "\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A", - "\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A", - "\u2C6F":"A", - "\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV", - "\uA73C":"AY", - "\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B", - "\u24B8":"C", - "\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C", - "\u023B":"C","\uA73E":"C", - "\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D", - "\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D", - "\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz", - "\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E", - "\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E", - "\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E", - "\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E", - "\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F", - "\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G", - "\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G", - "\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H", - "\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H", - "\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I", - "\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I", - "\u012E":"I","\u1E2C":"I","\u0197":"I", - "\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J", - "\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K", - "\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K", - "\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L", - "\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L", - "\uA780":"L", - "\u01C7":"LJ","\u01C8":"Lj", - "\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M", - "\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N", - "\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N", - "\u01CA":"NJ","\u01CB":"Nj", - "\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O", - "\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O", - "\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O", - "\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O", - "\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O", - "\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU", - "\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P", - "\uA754":"P", - "\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q", - "\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R", - "\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R", - "\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S", - "\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S", - "\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T", - "\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ", - "\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U", - "\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U", - "\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U", - "\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U", - "\u0244":"U", - "\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY", - "\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W", - "\u2C72":"W", - "\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X", - "\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y", - "\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y", - "\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z", - "\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z", - "\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a", - "\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a", - "\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a", - "\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a", - "\u2C65":"a","\u0250":"a", - "\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av", - "\uA73D":"ay", - "\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b", - "\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c", - "\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c", - "\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d", - "\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz", - "\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e", - "\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e", - "\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e", - "\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e", - "\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f", - "\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g", - "\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g", - "\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h", - "\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv", - "\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i", - "\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i", - "\u1E2D":"i","\u0268":"i","\u0131":"i", - "\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j", - "\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k", - "\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k", - "\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l", - "\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l", - "\uA781":"l","\uA747":"l","\u01C9":"lj", - "\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m", - "\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n", - "\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n", - "\u01CC":"nj", - "\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o", - "\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o", - "\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o", - "\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o", - "\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o", - "\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo", - "\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p", - "\uA755":"p", - "\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q", - "\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r", - "\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r", - "\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s", - "\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s", - "\u1E9B":"s", - "\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t", - "\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz", - "\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u", - "\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u", - "\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u", - "\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u", - "\u0289":"u", - "\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy", - "\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w", - "\u1E89":"w","\u2C73":"w", - "\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y", - "\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y", - "\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z", - "\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z", - "\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399", - "\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5", - "\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7", - "\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF", - "\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9", - "\u03C2":"\u03C3"} + DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399","\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5","\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7","\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF","\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9","\u03C2":"\u03C3"}; $document = $(document); From e2cd841fe893654f9d2b42b37160c45551185020 Mon Sep 17 00:00:00 2001 From: TheSisb Date: Wed, 14 May 2014 15:25:05 -0700 Subject: [PATCH 52/76] Handling mousemove more delicately Mousemove fires very frequently and is a sure way of killing any app's FPS. This tweak makes sure it is only bound when it is in fact needed. --- select2.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/select2.js b/select2.js index 580d32ed..1769fbc0 100644 --- a/select2.js +++ b/select2.js @@ -193,10 +193,6 @@ the specific language governing permissions and limitations under the Apache Lic }); } - $document.on("mousemove", function (e) { - lastMousePosition.x = e.pageX; - lastMousePosition.y = e.pageY; - }); /** * filters mouse events so an event is fired only if the mouse moved. @@ -1343,6 +1339,12 @@ the specific language governing permissions and limitations under the Apache Lic this.opening(); + // Only bind the document mousemove when the dropdown is visible + $document.on("mousemove.select2Event", function (e) { + lastMousePosition.x = e.pageX; + lastMousePosition.y = e.pageY; + }); + return true; }, @@ -1439,6 +1441,8 @@ the specific language governing permissions and limitations under the Apache Lic this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"); this.results.empty(); + // Now that the dropdown is closed, unbind the global document mousemove event + $document.off("mousemove.select2Event"); this.clearSearch(); this.search.removeClass("select2-active"); From a5b6ee431bd9ee4847eddc1da137a67accfee981 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Sun, 18 May 2014 05:31:42 +0100 Subject: [PATCH 53/76] Merge examples from wiki --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 3964bd22..2c7d2a0d 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,17 @@ Integrations * [Symfony2](https://github.com/avocode/FormExtensions) * [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) * [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) +* [Meteor](https://jquery-select2.meteor.com) * [Yii 2.x](http://demos.krajee.com/widgets#select2) * [Yii 1.x](https://github.com/tonybolzan/yii-select2) +* [AtmosphereJS](https://atmospherejs.com/package/jquery-select2) + +### Example Integrations + +* [Knockout.js](https://github.com/ivaynberg/select2/wiki/Knockout.js-Integration) +* [Socket.IO](https://github.com/ivaynberg/select2/wiki/Socket.IO-Integration) +* [PHP](https://github.com/ivaynberg/select2/wiki/PHP-Example) +* [.Net MVC] (https://github.com/ivaynberg/select2/wiki/.Net-MVC-Example) Internationalization (i18n) --------------------------- From 02d6e88747e8a86a8c3ed9af556adf42c2c9cfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Nicod=C3=A8me?= Date: Tue, 20 May 2014 09:30:35 +0200 Subject: [PATCH 54/76] Update select2.js Fix an exception when called "destroy" on a still opened dropdown. --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index 1769fbc0..7d979392 100644 --- a/select2.js +++ b/select2.js @@ -1194,7 +1194,7 @@ the specific language governing permissions and limitations under the Apache Lic // abstract opened: function () { - return this.container.hasClass("select2-dropdown-open"); + return (this.container) ? this.container.hasClass("select2-dropdown-open") : false; }, // abstract From 88c6a63937182fd2d141a6403492c6bd9c42b0a3 Mon Sep 17 00:00:00 2001 From: "Braden M. Kelley" Date: Fri, 23 May 2014 10:29:25 -0700 Subject: [PATCH 55/76] IE8 does not support Array.prototype.forEach #2339 --- select2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index 7d979392..19856edd 100644 --- a/select2.js +++ b/select2.js @@ -633,7 +633,7 @@ the specific language governing permissions and limitations under the Apache Lic function cleanupJQueryElements() { var self = this; - Array.prototype.forEach.call(arguments, function (element) { + $.each(arguments, function (i, element) { self[element].remove(); self[element] = null; }); @@ -1111,7 +1111,7 @@ the specific language governing permissions and limitations under the Apache Lic if (observer !== undefined) { if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; } this.propertyObserver = new observer(function (mutations) { - mutations.forEach(self._sync); + $.each(mutations, self._sync); }); this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false }); } From 9d44e06dc153d70e0811a91219448323153a9908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Po=C5=82tyn?= Date: Fri, 23 May 2014 22:36:51 +0100 Subject: [PATCH 56/76] Reword Polish string for formatInputTooShort --- select2_locale_pl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/select2_locale_pl.js b/select2_locale_pl.js index 75054e76..61cad44a 100644 --- a/select2_locale_pl.js +++ b/select2_locale_pl.js @@ -3,13 +3,14 @@ * * @author Jan Kondratowicz * @author Uriy Efremochkin + * @author Michał Połtyn */ (function ($) { "use strict"; $.extend($.fn.select2.defaults, { formatNoMatches: function () { return "Brak wyników"; }, - formatInputTooShort: function (input, min) { return "Wpisz jeszcze" + character(min - input.length, "znak", "i"); }, + formatInputTooShort: function (input, min) { return "Wpisz co najmniej" + character(min - input.length, "znak", "i"); }, formatInputTooLong: function (input, max) { return "Wpisana fraza jest za długa o" + character(input.length - max, "znak", "i"); }, formatSelectionTooBig: function (limit) { return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y"); }, formatLoadMore: function (pageNumber) { return "Ładowanie wyników…"; }, From f6597ad1c549c3377f2675398ef55a0919ff68b8 Mon Sep 17 00:00:00 2001 From: Aliaksei Sapach Date: Thu, 5 Jun 2014 17:05:44 +0300 Subject: [PATCH 57/76] updated translation template to match master --- select2_locale_en.js.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index f66bcc84..cf2b68f6 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -9,7 +9,7 @@ $.extend($.fn.select2.defaults, { formatMatches: function (matches) { return matches + " results are available, use up and down arrow keys to navigate."; }, formatNoMatches: function () { return "No matches found"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " more character" + (n == 1 ? "" : "s"); }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); }, formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Loading more results…"; }, From 4871aa54698233d6e7bbe51d06b896edb4d5d6d4 Mon Sep 17 00:00:00 2001 From: Aliaksei Sapach Date: Thu, 5 Jun 2014 17:41:23 +0300 Subject: [PATCH 58/76] updated russian translation now matches the latest template, see #2435 --- select2_locale_ru.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2_locale_ru.js b/select2_locale_ru.js index 0f45ce0d..5ec58e47 100644 --- a/select2_locale_ru.js +++ b/select2_locale_ru.js @@ -8,7 +8,7 @@ $.extend($.fn.select2.defaults, { formatNoMatches: function () { return "Совпадений не найдено"; }, - formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще" + character(min - input.length); }, + formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще хотя бы" + character(min - input.length); }, formatInputTooLong: function (input, max) { return "Пожалуйста, введите на" + character(input.length - max) + " меньше"; }, formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); }, formatLoadMore: function (pageNumber) { return "Загрузка данных…"; }, From 0675805621f7ef39c7fe6c3a133e5676bd8a27cf Mon Sep 17 00:00:00 2001 From: Cameron Spear Date: Fri, 6 Jun 2014 19:04:14 -0700 Subject: [PATCH 59/76] Fix error: Cannot read property 'top' of undefined Lines [1499](https://github.com/ivaynberg/select2/blob/d487fc58a889b471f7d587cc61baeca1d68de633/select2.js#L1499) and [1509](https://github.com/ivaynberg/select2/blob/d487fc58a889b471f7d587cc61baeca1d68de633/select2.js#L1509) make a call to `child.offset().top`. I don't know what's causing `child.offset()` to return undefined, but it is and it's breaking Select2 so that I can't select the last item in the list (this error occurs when I try hovering over or clicking on the last item in a list). I can try and create a reduced case, but this fix is 100% backward compatibe, passes all the tests you have for the project and has a 0% chance of breaking anyone's working code. With this patch, my dropdown works just fine. At worst, this does *nothing* for people, at best, it fixes a rare edge case. Like my edge case. And I'm a pretty important person to me. --- select2.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/select2.js b/select2.js index cf54469a..62514ef3 100644 --- a/select2.js +++ b/select2.js @@ -1476,7 +1476,7 @@ the specific language governing permissions and limitations under the Apache Lic // abstract ensureHighlightVisible: function () { - var results = this.results, children, index, child, hb, rb, y, more; + var results = this.results, children, index, child, hb, rb, y, more, topOffset; index = this.highlight(); @@ -1496,7 +1496,9 @@ the specific language governing permissions and limitations under the Apache Lic child = $(children[index]); - hb = child.offset().top + child.outerHeight(true); + topOffset = (child.offset() || {}).top || 0; + + hb = topOffset + child.outerHeight(true); // if this is the last child lets also make sure select2-more-results is visible if (index === children.length - 1) { @@ -1510,7 +1512,7 @@ the specific language governing permissions and limitations under the Apache Lic if (hb > rb) { results.scrollTop(results.scrollTop() + (hb - rb)); } - y = child.offset().top - results.offset().top; + y = topOffset - results.offset().top; // make sure the top of the element is visible if (y < 0 && child.css('display') != 'none' ) { From b13c9b474df3c8080ffd0b2375c3ddd1e936f2fa Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Wed, 11 Jun 2014 19:52:08 -0400 Subject: [PATCH 60/76] Small `formatMatches` change for single results This changes `formatMatches` to notify the user that they can select the single result. This is a more clear result compared to the previous one. This closes the following issue: https://github.com/ivaynberg/select2/issues/2329 --- select2.js | 6 +++--- select2_locale_en.js.template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/select2.js b/select2.js index cf54469a..a07e3231 100644 --- a/select2.js +++ b/select2.js @@ -1110,7 +1110,7 @@ the specific language governing permissions and limitations under the Apache Lic this.attachEvent("onpropertychange", self._sync); }); } - + // safari, chrome, firefox, IE11 observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver; if (observer !== undefined) { @@ -1349,7 +1349,7 @@ the specific language governing permissions and limitations under the Apache Lic lastMousePosition.x = e.pageX; lastMousePosition.y = e.pageY; }); - + return true; }, @@ -3397,7 +3397,7 @@ the specific language governing permissions and limitations under the Apache Lic }, formatResultCssClass: function(data) {return data.css;}, formatSelectionCssClass: function(data, container) {return undefined;}, - formatMatches: function (matches) { return matches + " results are available, use up and down arrow keys to navigate."; }, + formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, formatNoMatches: function () { return "No matches found"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); }, diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index cf2b68f6..9a65edd6 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -1,13 +1,13 @@ /** * Select2 translation. - * + * * Author: Your Name */ (function ($) { "use strict"; $.extend($.fn.select2.defaults, { - formatMatches: function (matches) { return matches + " results are available, use up and down arrow keys to navigate."; }, + formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, formatNoMatches: function () { return "No matches found"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); }, From 9e17f6301334f21ca358f21285d6d00f75b90fb0 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Wed, 11 Jun 2014 20:02:23 -0400 Subject: [PATCH 61/76] Normalized `select2-selecting` event This normalizes the `select2-selecting` event so the object is returned as `choice` in the event data. While the documentation points to the name being `object`, all other events return the affected data object as `choice`. This closes the following issue: https://github.com/ivaynberg/select2/issues/2340 --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index a07e3231..1803259a 100644 --- a/select2.js +++ b/select2.js @@ -1124,7 +1124,7 @@ the specific language governing permissions and limitations under the Apache Lic // abstract triggerSelect: function(data) { - var evt = $.Event("select2-selecting", { val: this.id(data), object: data }); + var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data }); this.opts.element.trigger(evt); return !evt.isDefaultPrevented(); }, From 3fee8fc7e63ee394b90da813a5a80362ab2b27b5 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Wed, 11 Jun 2014 20:06:41 -0400 Subject: [PATCH 62/76] Detect classes separated by multiple spaces This detects classes separated by multiple spaces and will trim extra spaces surrounding the class attribute. This closes the following issue: https://github.com/ivaynberg/select2/issues/2358 --- select2.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/select2.js b/select2.js index 1803259a..2c308ccc 100644 --- a/select2.js +++ b/select2.js @@ -320,27 +320,34 @@ the specific language governing permissions and limitations under the Apache Lic function syncCssClasses(dest, src, adapter) { var classes, replacements = [], adapted; - classes = dest.attr("class"); + classes = $.trim(dest.attr("class")); + if (classes) { classes = '' + classes; // for IE which returns object - $(classes.split(" ")).each2(function() { + + $(classes.split(/\s+/)).each2(function() { if (this.indexOf("select2-") === 0) { replacements.push(this); } }); } - classes = src.attr("class"); + + classes = $.trim(src.attr("class")); + if (classes) { classes = '' + classes; // for IE which returns object - $(classes.split(" ")).each2(function() { + + $(classes.split(/\s+/)).each2(function() { if (this.indexOf("select2-") !== 0) { adapted = adapter(this); + if (adapted) { replacements.push(adapted); } } }); } + dest.attr("class", replacements.join(" ")); } From 0d9893936cf115d781f31ebc46693554b701ff0e Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Mon, 16 Jun 2014 19:29:46 -0400 Subject: [PATCH 63/76] modified version identifiers in descriptors for release 3.5.0 --- bower.json | 2 +- component.json | 2 +- composer.json | 2 +- package.json | 2 +- select2.jquery.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 80e8596e..c34731aa 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "select2", - "version": "3.4.8", + "version": "3.5.0", "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"], "dependencies": { "jquery": ">= 1.7.1" diff --git a/component.json b/component.json index ad7abf9d..cdc02aab 100644 --- a/component.json +++ b/component.json @@ -2,7 +2,7 @@ "name": "select2", "repo": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "version": "3.4.8", + "version": "3.5.0", "demo": "http://ivaynberg.github.io/select2/", "keywords": [ "jquery" diff --git a/composer.json b/composer.json index c50fadba..471256ab 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "ivaynberg/select2", "description": "Select2 is a jQuery based replacement for select boxes.", - "version": "3.4.8", + "version": "3.5.0", "type": "component", "homepage": "http://ivaynberg.github.io/select2/", "license": "Apache-2.0", diff --git a/package.json b/package.json index 75ad84ac..d2a7b6c1 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Igor Vaynberg", "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"}, "main": "select2.js", - "version": "3.4.8", + "version": "3.5.0", "jspm": { "main": "select2", "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"], diff --git a/select2.jquery.json b/select2.jquery.json index e9119279..3c447eca 100644 --- a/select2.jquery.json +++ b/select2.jquery.json @@ -11,7 +11,7 @@ "tag", "tagging" ], - "version": "3.4.8", + "version": "3.5.0", "author": { "name": "Igor Vaynberg", "url": "https://github.com/ivaynberg" From 78526a3860453773a3f70f0633aa2770b5e423a3 Mon Sep 17 00:00:00 2001 From: Vitaliy Ryaboy Date: Tue, 17 Jun 2014 13:47:31 +0200 Subject: [PATCH 64/76] Update select2.js fixed destroy --- select2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2.js b/select2.js index cae42c20..68ed8d34 100644 --- a/select2.js +++ b/select2.js @@ -836,13 +836,13 @@ the specific language governing permissions and limitations under the Apache Lic // abstract destroy: function () { - var element=this.opts.element, select2 = element.data("select2"); + var element=this.opts.element, select2 = element.data("select2"), self = this; this.close(); if (element.length && element[0].detachEvent) { element.each(function () { - this.detachEvent("onpropertychange", this._sync); + this.detachEvent("onpropertychange", self._sync); }); } if (this.propertyObserver) { From c0cc6c9f94dbfe12839e85f38a6387a7970a784c Mon Sep 17 00:00:00 2001 From: tjperovich Date: Tue, 17 Jun 2014 10:11:09 -0400 Subject: [PATCH 65/76] Fix there/their typo --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index cae42c20..761ac09e 100644 --- a/select2.js +++ b/select2.js @@ -1027,7 +1027,7 @@ the specific language governing permissions and limitations under the Apache Lic query.callback(data); }); - // this is needed because inside val() we construct choices from options and there id is hardcoded + // this is needed because inside val() we construct choices from options and their id is hardcoded opts.id=function(e) { return e.id; }; } else { if (!("query" in opts)) { From 2690053010f8e510c4ca838800c2e780675d0bc1 Mon Sep 17 00:00:00 2001 From: Siegfried Bilstein Date: Sat, 21 Jun 2014 11:36:48 -0700 Subject: [PATCH 66/76] Fixes #2434 Tagging support allows creation of tags that are only whitespace --- select2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2.js b/select2.js index f904d621..7a425e8e 100644 --- a/select2.js +++ b/select2.js @@ -2953,7 +2953,7 @@ the specific language governing permissions and limitations under the Apache Lic // multi onSelect: function (data, options) { - if (!this.triggerSelect(data)) { return; } + if (!this.triggerSelect(data) || data.text === "") { return; } this.addSelectedChoice(data); From 7c1ceb8fd9d19d072585a44c5d07c4d480f1ac54 Mon Sep 17 00:00:00 2001 From: Vasily Kazantsev Date: Sun, 22 Jun 2014 19:07:36 +0300 Subject: [PATCH 67/76] filter 229 keyCodes (input method editor is processing key input) --- select2.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/select2.js b/select2.js index 7a425e8e..445f93a4 100644 --- a/select2.js +++ b/select2.js @@ -2101,6 +2101,9 @@ the specific language governing permissions and limitations under the Apache Lic this.search.on("keydown", this.bind(function (e) { if (!this.isInterfaceEnabled()) return; + // filter 229 keyCodes (input method editor is processing key input) + if (229 == e.keyCode) return; + if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) { // prevent the page from scrolling killEvent(e); From b5056016294224a666afb611498a720525b7559c Mon Sep 17 00:00:00 2001 From: Ermish Date: Wed, 25 Jun 2014 19:40:08 -0400 Subject: [PATCH 68/76] Added Ajax Error Handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added an error message when an ajax error occurs. This can be overridden through the select2 option “formatAjaxError”. --- select2.css | 6 +++++- select2.js | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/select2.css b/select2.css index df8b9fcc..e43fd401 100644 --- a/select2.css +++ b/select2.css @@ -422,9 +422,9 @@ html[dir="rtl"] .select2-results { color: #000; } - .select2-results .select2-no-results, .select2-results .select2-searching, +.select2-results .select2-ajax-error, .select2-results .select2-selection-limit { background: #f4f4f4; display: list-item; @@ -454,6 +454,10 @@ disabled look for disabled choices in the results dropdown background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%; } +.select2-results .select2-ajax-error { + background: rgba(255, 50, 50, .2); +} + .select2-more-results { background: #f4f4f4; display: list-item; diff --git a/select2.js b/select2.js index 7a425e8e..25d12b0d 100644 --- a/select2.js +++ b/select2.js @@ -443,6 +443,16 @@ the specific language governing permissions and limitations under the Apache Lic // TODO - replace query.page with query so users have access to term, page, etc. // added query as third paramter to keep backwards compatibility var results = options.results(data, query.page, query); + query.callback(results); + }, + error: function(jqXHR, textStatus, errorThrown){ + var results = { + hasError: true, + jqXHR: jqXHR, + textStatus: textStatus, + errorThrown: errorThrown, + }; + query.callback(results); } }); @@ -1766,6 +1776,12 @@ the specific language governing permissions and limitations under the Apache Lic return; } + // handle ajax error + if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) { + render("
  • " + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "
    • "); + return; + } + // save context, if any this.context = (data.context===undefined) ? null : data.context; // create a default choice and prepend it to the list @@ -3408,6 +3424,7 @@ the specific language governing permissions and limitations under the Apache Lic formatSelectionCssClass: function(data, container) {return undefined;}, formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, formatNoMatches: function () { return "No matches found"; }, + formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); }, formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, From d19bb1c32cbc1191c19b01f0db34f8d7f0601fc8 Mon Sep 17 00:00:00 2001 From: Ermish Date: Wed, 25 Jun 2014 19:44:49 -0400 Subject: [PATCH 69/76] gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c6ef2182..a54f152e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .idea +example.html +*.iml From 36db1f196624fa935c66eb8751d97dcaf0011fde Mon Sep 17 00:00:00 2001 From: Ermish Date: Wed, 25 Jun 2014 20:19:21 -0400 Subject: [PATCH 70/76] Revert "gitignore" This reverts commit d19bb1c32cbc1191c19b01f0db34f8d7f0601fc8. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index a54f152e..c6ef2182 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ .idea -example.html -*.iml From 837715f9391a493a53446dbed411b727cb788e96 Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Tue, 15 Apr 2014 09:20:22 +0200 Subject: [PATCH 71/76] Fixes #2278 Instead of instantly applying the translations, add them to an array. That way users can include the language files that their site supports and apply the required language using $.extend($.fn.select2.defaults, $.fn.select2.locales["nl"]); Signed-off-by: Kevin Brown --- select2.js | 23 +++++++++++++++-------- select2_locale_ar.js | 2 +- select2_locale_bg.js | 2 +- select2_locale_ca.js | 2 +- select2_locale_cs.js | 2 +- select2_locale_da.js | 2 +- select2_locale_de.js | 2 +- select2_locale_el.js | 2 +- select2_locale_en.js.template | 2 +- select2_locale_es.js | 2 +- select2_locale_et.js | 2 +- select2_locale_eu.js | 2 +- select2_locale_fa.js | 2 +- select2_locale_fi.js | 2 +- select2_locale_fr.js | 2 +- select2_locale_gl.js | 2 +- select2_locale_he.js | 2 +- select2_locale_hr.js | 2 +- select2_locale_hu.js | 2 +- select2_locale_id.js | 2 +- select2_locale_is.js | 2 +- select2_locale_it.js | 2 +- select2_locale_ja.js | 2 +- select2_locale_ka.js | 2 +- select2_locale_ko.js | 2 +- select2_locale_lt.js | 2 +- select2_locale_lv.js | 2 +- select2_locale_mk.js | 2 +- select2_locale_ms.js | 2 +- select2_locale_nl.js | 2 +- select2_locale_no.js | 2 +- select2_locale_pl.js | 2 +- select2_locale_pt-BR.js | 2 +- select2_locale_pt-PT.js | 2 +- select2_locale_ro.js | 2 +- select2_locale_rs.js | 2 +- select2_locale_ru.js | 2 +- select2_locale_sk.js | 2 +- select2_locale_sv.js | 2 +- select2_locale_th.js | 2 +- select2_locale_tr.js | 2 +- select2_locale_uk.js | 2 +- select2_locale_vi.js | 2 +- select2_locale_zh-CN.js | 2 +- select2_locale_zh-TW.js | 2 +- 45 files changed, 59 insertions(+), 52 deletions(-) diff --git a/select2.js b/select2.js index 2320df74..fa4d21a7 100644 --- a/select2.js +++ b/select2.js @@ -3425,14 +3425,6 @@ the specific language governing permissions and limitations under the Apache Lic }, formatResultCssClass: function(data) {return data.css;}, formatSelectionCssClass: function(data, container) {return undefined;}, - formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, - formatNoMatches: function () { return "No matches found"; }, - formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1? "" : "s"); }, - formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); }, - formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, - formatLoadMore: function (pageNumber) { return "Loading more results…"; }, - formatSearching: function () { return "Searching…"; }, minimumResultsForSearch: 0, minimumInputLength: 0, maximumInputLength: null, @@ -3471,6 +3463,21 @@ the specific language governing permissions and limitations under the Apache Lic } }; + $.fn.select2.locales = []; + + $.fn.select2.locales['en'] = { + formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, + formatNoMatches: function () { return "No matches found"; }, + formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, + formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); }, + formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, + formatLoadMore: function (pageNumber) { return "Loading more results…"; }, + formatSearching: function () { return "Searching…"; }, + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); + $.fn.select2.ajaxDefaults = { transport: $.ajax, params: { diff --git a/select2_locale_ar.js b/select2_locale_ar.js index acb33a2f..bdc19c95 100644 --- a/select2_locale_ar.js +++ b/select2_locale_ar.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ar'] = { formatNoMatches: function () { return "لم يتم العثور على مطابقات"; }, formatInputTooShort: function (input, min) { var n = min - input.length; if (n == 1){ return "الرجاء إدخال حرف واحد على الأكثر"; } return n == 2 ? "الرجاء إدخال حرفين على الأكثر" : "الرجاء إدخال " + n + " على الأكثر"; }, formatInputTooLong: function (input, max) { var n = input.length - max; if (n == 1){ return "الرجاء إدخال حرف واحد على الأقل"; } return n == 2 ? "الرجاء إدخال حرفين على الأقل" : "الرجاء إدخال " + n + " على الأقل "; }, diff --git a/select2_locale_bg.js b/select2_locale_bg.js index 585d28a2..360ed07b 100644 --- a/select2_locale_bg.js +++ b/select2_locale_bg.js @@ -7,7 +7,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['bg'] = { formatNoMatches: function () { return "Няма намерени съвпадения"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Моля въведете още " + n + " символ" + (n > 1 ? "а" : ""); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Моля въведете с " + n + " по-малко символ" + (n > 1 ? "а" : ""); }, diff --git a/select2_locale_ca.js b/select2_locale_ca.js index 7e19d3ce..3a288fdc 100644 --- a/select2_locale_ca.js +++ b/select2_locale_ca.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ca'] = { formatNoMatches: function () { return "No s'ha trobat cap coincidència"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduïu " + n + " caràcter" + (n == 1 ? "" : "s") + " més"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Introduïu " + n + " caràcter" + (n == 1? "" : "s") + "menys"; }, diff --git a/select2_locale_cs.js b/select2_locale_cs.js index 376b54a1..d36e45da 100644 --- a/select2_locale_cs.js +++ b/select2_locale_cs.js @@ -12,7 +12,7 @@ 3: function() { return "tři"; }, 4: function() { return "čtyři"; } } - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['cs'] = { formatNoMatches: function () { return "Nenalezeny žádné položky"; }, formatInputTooShort: function (input, min) { var n = min - input.length; diff --git a/select2_locale_da.js b/select2_locale_da.js index dbce3e17..d67c445f 100644 --- a/select2_locale_da.js +++ b/select2_locale_da.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['da'] = { formatNoMatches: function () { return "Ingen resultater fundet"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Angiv venligst " + n + " tegn mere"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Angiv venligst " + n + " tegn mindre"; }, diff --git a/select2_locale_de.js b/select2_locale_de.js index ee971ac4..5e41f36b 100644 --- a/select2_locale_de.js +++ b/select2_locale_de.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['de'] = { formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; }, diff --git a/select2_locale_el.js b/select2_locale_el.js index e94b02cb..a5d8fed1 100644 --- a/select2_locale_el.js +++ b/select2_locale_el.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['el'] = { formatNoMatches: function () { return "Δεν βρέθηκαν αποτελέσματα"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Παρακαλούμε εισάγετε " + n + " περισσότερο" + (n > 1 ? "υς" : "") + " χαρακτήρ" + (n > 1 ? "ες" : "α"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Παρακαλούμε διαγράψτε " + n + " χαρακτήρ" + (n > 1 ? "ες" : "α"); }, diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index 9a65edd6..adf3d19f 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['en'] = { formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; }, formatNoMatches: function () { return "No matches found"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); }, diff --git a/select2_locale_es.js b/select2_locale_es.js index f2b58179..15d515d3 100644 --- a/select2_locale_es.js +++ b/select2_locale_es.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['es'] = { formatNoMatches: function () { return "No se encontraron resultados"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Por favor, introduzca " + n + " car" + (n == 1? "ácter" : "acteres"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Por favor, elimine " + n + " car" + (n == 1? "ácter" : "acteres"); }, diff --git a/select2_locale_et.js b/select2_locale_et.js index a4045d22..4a9bc36c 100644 --- a/select2_locale_et.js +++ b/select2_locale_et.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['et'] = { formatNoMatches: function () { return "Tulemused puuduvad"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Sisesta " + n + " täht" + (n == 1 ? "" : "e") + " rohkem"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Sisesta " + n + " täht" + (n == 1? "" : "e") + " vähem"; }, diff --git a/select2_locale_eu.js b/select2_locale_eu.js index 1da1a709..4e8873fa 100644 --- a/select2_locale_eu.js +++ b/select2_locale_eu.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['eu'] = { formatNoMatches: function () { return "Ez da bat datorrenik aurkitu"; }, diff --git a/select2_locale_fa.js b/select2_locale_fa.js index a9e95af4..6ffbde32 100644 --- a/select2_locale_fa.js +++ b/select2_locale_fa.js @@ -7,7 +7,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['fa'] = { formatMatches: function (matches) { return matches + " نتیجه موجود است، کلیدهای جهت بالا و پایین را برای گشتن استفاده کنید."; }, formatNoMatches: function () { return "نتیجه‌ای یافت نشد."; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "لطفاً " + n + " نویسه بیشتر وارد نمایید"; }, diff --git a/select2_locale_fi.js b/select2_locale_fi.js index 9bed310f..e67407cc 100644 --- a/select2_locale_fi.js +++ b/select2_locale_fi.js @@ -3,7 +3,7 @@ */ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['fi'] = { formatNoMatches: function () { return "Ei tuloksia"; }, diff --git a/select2_locale_fr.js b/select2_locale_fr.js index 110854f8..a9711d47 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['fr'] = { formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; }, formatNoMatches: function () { return "Aucun résultat trouvé"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Saisissez " + n + " caractère" + (n == 1? "" : "s") + " supplémentaire" + (n == 1? "" : "s") ; }, diff --git a/select2_locale_gl.js b/select2_locale_gl.js index 80326320..252fb112 100644 --- a/select2_locale_gl.js +++ b/select2_locale_gl.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['gl'] = { formatNoMatches: function () { return "Non se atoparon resultados"; }, diff --git a/select2_locale_he.js b/select2_locale_he.js index 00385410..e34ab0b4 100644 --- a/select2_locale_he.js +++ b/select2_locale_he.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['he'] = { formatNoMatches: function () { return "לא נמצאו התאמות"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "נא להזין עוד " + n + " תווים נוספים"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "נא להזין פחות " + n + " תווים"; }, diff --git a/select2_locale_hr.js b/select2_locale_hr.js index c2937252..1bc19f63 100644 --- a/select2_locale_hr.js +++ b/select2_locale_hr.js @@ -7,7 +7,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['hr'] = { formatNoMatches: function () { return "Nema rezultata"; }, formatInputTooShort: function (input, min) { return "Unesite još" + character(min - input.length); }, formatInputTooLong: function (input, max) { return "Unesite" + character(input.length - max) + " manje"; }, diff --git a/select2_locale_hu.js b/select2_locale_hu.js index a8c30881..69faa999 100644 --- a/select2_locale_hu.js +++ b/select2_locale_hu.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['hu'] = { formatNoMatches: function () { return "Nincs találat."; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Túl rövid. Még " + n + " karakter hiányzik."; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Túl hosszú. " + n + " karakterrel több, mint kellene."; }, diff --git a/select2_locale_id.js b/select2_locale_id.js index 54745407..243f8cf3 100644 --- a/select2_locale_id.js +++ b/select2_locale_id.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['id'] = { formatNoMatches: function () { return "Tidak ada data yang sesuai"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Masukkan " + n + " huruf lagi" + (n == 1 ? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Hapus " + n + " huruf" + (n == 1 ? "" : "s"); }, diff --git a/select2_locale_is.js b/select2_locale_is.js index aecc6cd7..79778d08 100644 --- a/select2_locale_is.js +++ b/select2_locale_is.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['is'] = { formatNoMatches: function () { return "Ekkert fannst"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Vinsamlegast skrifið " + n + " staf" + (n > 1 ? "i" : "") + " í viðbót"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Vinsamlegast styttið texta um " + n + " staf" + (n > 1 ? "i" : ""); }, diff --git a/select2_locale_it.js b/select2_locale_it.js index d4e24de7..5171c162 100644 --- a/select2_locale_it.js +++ b/select2_locale_it.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['it'] = { formatNoMatches: function () { return "Nessuna corrispondenza trovata"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Inserisci ancora " + n + " caratter" + (n == 1? "e" : "i"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Inserisci " + n + " caratter" + (n == 1? "e" : "i") + " in meno"; }, diff --git a/select2_locale_ja.js b/select2_locale_ja.js index 81106e78..ddc7abf0 100644 --- a/select2_locale_ja.js +++ b/select2_locale_ja.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ja'] = { formatNoMatches: function () { return "該当なし"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "後" + n + "文字入れてください"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "検索文字列が" + n + "文字長すぎます"; }, diff --git a/select2_locale_ka.js b/select2_locale_ka.js index 366cc2d9..f36410ae 100644 --- a/select2_locale_ka.js +++ b/select2_locale_ka.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ka'] = { formatNoMatches: function () { return "ვერ მოიძებნა"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "გთხოვთ შეიყვანოთ კიდევ " + n + " სიმბოლო"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "გთხოვთ წაშალოთ " + n + " სიმბოლო"; }, diff --git a/select2_locale_ko.js b/select2_locale_ko.js index 1a84d21e..9324c4bd 100644 --- a/select2_locale_ko.js +++ b/select2_locale_ko.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ko'] = { formatNoMatches: function () { return "결과 없음"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "너무 짧습니다. "+n+"글자 더 입력해주세요."; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "너무 깁니다. "+n+"글자 지워주세요."; }, diff --git a/select2_locale_lt.js b/select2_locale_lt.js index 2e2f950b..f63a7d10 100644 --- a/select2_locale_lt.js +++ b/select2_locale_lt.js @@ -7,7 +7,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['lt'] = { formatNoMatches: function () { return "Atitikmenų nerasta"; }, formatInputTooShort: function (input, min) { return "Įrašykite dar" + character(min - input.length); }, formatInputTooLong: function (input, max) { return "Pašalinkite" + character(input.length - max); }, diff --git a/select2_locale_lv.js b/select2_locale_lv.js index b300ec77..c684876f 100644 --- a/select2_locale_lv.js +++ b/select2_locale_lv.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['lv'] = { formatNoMatches: function () { return "Sakritību nav"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Lūdzu ievadiet vēl " + n + " simbol" + (n == 11 ? "us" : n%10 == 1 ? "u" : "us"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Lūdzu ievadiet par " + n + " simbol" + (n == 11 ? "iem" : n%10 == 1 ? "u" : "iem") + " mazāk"; }, diff --git a/select2_locale_mk.js b/select2_locale_mk.js index 513562c5..4504f903 100644 --- a/select2_locale_mk.js +++ b/select2_locale_mk.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['mk'] = { formatNoMatches: function () { return "Нема пронајдено совпаѓања"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Ве молиме внесете уште " + n + " карактер" + (n == 1 ? "" : "и"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Ве молиме внесете " + n + " помалку карактер" + (n == 1? "" : "и"); }, diff --git a/select2_locale_ms.js b/select2_locale_ms.js index 262042aa..21b6a05c 100644 --- a/select2_locale_ms.js +++ b/select2_locale_ms.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ms'] = { formatNoMatches: function () { return "Tiada padanan yang ditemui"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Sila masukkan " + n + " aksara lagi"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Sila hapuskan " + n + " aksara"; }, diff --git a/select2_locale_nl.js b/select2_locale_nl.js index 5b5c4156..76045317 100644 --- a/select2_locale_nl.js +++ b/select2_locale_nl.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['nl'] = { formatNoMatches: function () { return "Geen resultaten gevonden"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Vul " + n + " karakter" + (n == 1? "" : "s") + " meer in"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Vul " + n + " karakter" + (n == 1? "" : "s") + " minder in"; }, diff --git a/select2_locale_no.js b/select2_locale_no.js index ab61c082..5e1324d0 100644 --- a/select2_locale_no.js +++ b/select2_locale_no.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['no'] = { formatNoMatches: function () { return "Ingen treff"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Vennligst skriv inn " + n + (n>1 ? " flere tegn" : " tegn til"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Vennligst fjern " + n + " tegn"; }, diff --git a/select2_locale_pl.js b/select2_locale_pl.js index 61cad44a..d647dc9c 100644 --- a/select2_locale_pl.js +++ b/select2_locale_pl.js @@ -8,7 +8,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['pl'] = { formatNoMatches: function () { return "Brak wyników"; }, formatInputTooShort: function (input, min) { return "Wpisz co najmniej" + character(min - input.length, "znak", "i"); }, formatInputTooLong: function (input, max) { return "Wpisana fraza jest za długa o" + character(input.length - max, "znak", "i"); }, diff --git a/select2_locale_pt-BR.js b/select2_locale_pt-BR.js index ac4969ac..d097054b 100644 --- a/select2_locale_pt-BR.js +++ b/select2_locale_pt-BR.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['pt-BR'] = { formatNoMatches: function () { return "Nenhum resultado encontrado"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Digite mais " + n + " caracter" + (n == 1? "" : "es"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caracter" + (n == 1? "" : "es"); }, diff --git a/select2_locale_pt-PT.js b/select2_locale_pt-PT.js index cced7cf3..ee18349c 100644 --- a/select2_locale_pt-PT.js +++ b/select2_locale_pt-PT.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['pt-PT'] = { formatNoMatches: function () { return "Nenhum resultado encontrado"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduza " + n + " car" + (n == 1 ? "ácter" : "acteres"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " car" + (n == 1 ? "ácter" : "acteres"); }, diff --git a/select2_locale_ro.js b/select2_locale_ro.js index 87eca4cf..6fb26874 100644 --- a/select2_locale_ro.js +++ b/select2_locale_ro.js @@ -4,7 +4,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ro'] = { formatNoMatches: function () { return "Nu a fost găsit nimic"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Vă rugăm să introduceți incă " + n + " caracter" + (n == 1 ? "" : "e"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Vă rugăm să introduceți mai puțin de " + n + " caracter" + (n == 1? "" : "e"); }, diff --git a/select2_locale_rs.js b/select2_locale_rs.js index 300c01bc..97569fc9 100644 --- a/select2_locale_rs.js +++ b/select2_locale_rs.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['rs'] = { formatNoMatches: function () { return "Ništa nije pronađeno"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Ukucajte bar još " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Obrišite " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); }, diff --git a/select2_locale_ru.js b/select2_locale_ru.js index 5ec58e47..44a36f04 100644 --- a/select2_locale_ru.js +++ b/select2_locale_ru.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['ru'] = { formatNoMatches: function () { return "Совпадений не найдено"; }, formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще хотя бы" + character(min - input.length); }, formatInputTooLong: function (input, max) { return "Пожалуйста, введите на" + character(input.length - max) + " меньше"; }, diff --git a/select2_locale_sk.js b/select2_locale_sk.js index 772f304a..707f5f99 100644 --- a/select2_locale_sk.js +++ b/select2_locale_sk.js @@ -11,7 +11,7 @@ 3: function() { return "tri"; }, 4: function() { return "štyri"; } } - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['sk'] = { formatNoMatches: function () { return "Nenašli sa žiadne položky"; }, formatInputTooShort: function (input, min) { var n = min - input.length; diff --git a/select2_locale_sv.js b/select2_locale_sv.js index d611189a..26f6f512 100644 --- a/select2_locale_sv.js +++ b/select2_locale_sv.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['sv'] = { formatNoMatches: function () { return "Inga träffar"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Var god skriv in " + n + (n>1 ? " till tecken" : " tecken till"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Var god sudda ut " + n + " tecken"; }, diff --git a/select2_locale_th.js b/select2_locale_th.js index df59bdac..7004d2a5 100644 --- a/select2_locale_th.js +++ b/select2_locale_th.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['th'] = { formatNoMatches: function () { return "ไม่พบข้อมูล"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "โปรดพิมพ์เพิ่มอีก " + n + " ตัวอักษร"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "โปรดลบออก " + n + " ตัวอักษร"; }, diff --git a/select2_locale_tr.js b/select2_locale_tr.js index f834dad2..e9d7a0aa 100644 --- a/select2_locale_tr.js +++ b/select2_locale_tr.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['tr'] = { formatNoMatches: function () { return "Sonuç bulunamadı"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "En az " + n + " karakter daha girmelisiniz"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return n + " karakter azaltmalısınız"; }, diff --git a/select2_locale_uk.js b/select2_locale_uk.js index 8d31a056..cd970b35 100644 --- a/select2_locale_uk.js +++ b/select2_locale_uk.js @@ -7,7 +7,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['uk'] = { formatMatches: function (matches) { return character(matches, "результат") + " знайдено, використовуйте клавіші зі стрілками вверх та вниз для навігації."; }, formatNoMatches: function () { return "Нічого не знайдено"; }, formatInputTooShort: function (input, min) { return "Введіть буль ласка ще " + character(min - input.length, "символ"); }, diff --git a/select2_locale_vi.js b/select2_locale_vi.js index 5dbc2753..1d2dc383 100644 --- a/select2_locale_vi.js +++ b/select2_locale_vi.js @@ -6,7 +6,7 @@ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['vi'] = { formatNoMatches: function () { return "Không tìm thấy kết quả"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "Vui lòng nhập nhiều hơn " + n + " ký tự" + (n == 1 ? "" : "s"); }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Vui lòng nhập ít hơn " + n + " ký tự" + (n == 1? "" : "s"); }, diff --git a/select2_locale_zh-CN.js b/select2_locale_zh-CN.js index 6add3c52..f20332f3 100644 --- a/select2_locale_zh-CN.js +++ b/select2_locale_zh-CN.js @@ -3,7 +3,7 @@ */ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['zh-CN'] = { formatNoMatches: function () { return "没有找到匹配项"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "请再输入" + n + "个字符";}, formatInputTooLong: function (input, max) { var n = input.length - max; return "请删掉" + n + "个字符";}, diff --git a/select2_locale_zh-TW.js b/select2_locale_zh-TW.js index f072381f..10fe24ea 100644 --- a/select2_locale_zh-TW.js +++ b/select2_locale_zh-TW.js @@ -3,7 +3,7 @@ */ (function ($) { "use strict"; - $.extend($.fn.select2.defaults, { + $.fn.select2.locales['zh-TW'] = { formatNoMatches: function () { return "沒有找到相符的項目"; }, formatInputTooShort: function (input, min) { var n = min - input.length; return "請再輸入" + n + "個字元";}, formatInputTooLong: function (input, max) { var n = input.length - max; return "請刪掉" + n + "個字元";}, From 6b92b1c211d9e2769d5aafebd097fa99fe4b58c8 Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Thu, 15 May 2014 12:55:44 +0200 Subject: [PATCH 72/76] Immediately apply language when including Signed-off-by: Kevin Brown --- select2_locale_ar.js | 5 ++++- select2_locale_bg.js | 5 ++++- select2_locale_ca.js | 5 ++++- select2_locale_cs.js | 5 ++++- select2_locale_da.js | 5 ++++- select2_locale_de.js | 7 +++++-- select2_locale_el.js | 5 ++++- select2_locale_en.js.template | 5 ++++- select2_locale_es.js | 5 ++++- select2_locale_et.js | 5 ++++- select2_locale_eu.js | 5 ++++- select2_locale_fa.js | 5 ++++- select2_locale_fi.js | 5 ++++- select2_locale_fr.js | 5 ++++- select2_locale_gl.js | 5 ++++- select2_locale_he.js | 5 ++++- select2_locale_hr.js | 5 ++++- select2_locale_hu.js | 5 ++++- select2_locale_id.js | 5 ++++- select2_locale_is.js | 5 ++++- select2_locale_it.js | 5 ++++- select2_locale_ja.js | 5 ++++- select2_locale_ka.js | 5 ++++- select2_locale_ko.js | 5 ++++- select2_locale_lt.js | 5 ++++- select2_locale_lv.js | 5 ++++- select2_locale_mk.js | 5 ++++- select2_locale_ms.js | 5 ++++- select2_locale_nl.js | 5 ++++- select2_locale_no.js | 5 ++++- select2_locale_pl.js | 5 ++++- select2_locale_pt-BR.js | 5 ++++- select2_locale_pt-PT.js | 5 ++++- select2_locale_ro.js | 5 ++++- select2_locale_rs.js | 5 ++++- select2_locale_ru.js | 5 ++++- select2_locale_sk.js | 5 ++++- select2_locale_sv.js | 5 ++++- select2_locale_th.js | 5 ++++- select2_locale_tr.js | 5 ++++- select2_locale_uk.js | 6 +++++- select2_locale_vi.js | 5 ++++- select2_locale_zh-CN.js | 5 ++++- select2_locale_zh-TW.js | 5 ++++- 44 files changed, 178 insertions(+), 45 deletions(-) diff --git a/select2_locale_ar.js b/select2_locale_ar.js index bdc19c95..119f89b1 100644 --- a/select2_locale_ar.js +++ b/select2_locale_ar.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { if (n == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return n == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + n + " إختيارات فقط"; }, formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; }, formatSearching: function () { return "البحث…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']); + ); })(jQuery); diff --git a/select2_locale_bg.js b/select2_locale_bg.js index 360ed07b..e309aec6 100644 --- a/select2_locale_bg.js +++ b/select2_locale_bg.js @@ -14,5 +14,8 @@ formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); }, formatLoadMore: function (pageNumber) { return "Зареждат се още…"; }, formatSearching: function () { return "Търсене…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']); + ); })(jQuery); diff --git a/select2_locale_ca.js b/select2_locale_ca.js index 3a288fdc..a6c3a377 100644 --- a/select2_locale_ca.js +++ b/select2_locale_ca.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; }, formatSearching: function () { return "S'està cercant…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']); + ); })(jQuery); diff --git a/select2_locale_cs.js b/select2_locale_cs.js index d36e45da..5fe984f9 100644 --- a/select2_locale_cs.js +++ b/select2_locale_cs.js @@ -45,5 +45,8 @@ }, formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; }, formatSearching: function () { return "Vyhledávání…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['cs']); + ); })(jQuery); diff --git a/select2_locale_da.js b/select2_locale_da.js index d67c445f..df95bd32 100644 --- a/select2_locale_da.js +++ b/select2_locale_da.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); }, formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; }, formatSearching: function () { return "Søger…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); + ); })(jQuery); diff --git a/select2_locale_de.js b/select2_locale_de.js index 5e41f36b..67fa42bd 100644 --- a/select2_locale_de.js +++ b/select2_locale_de.js @@ -12,5 +12,8 @@ formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; }, formatSearching: function () { return "Suche…"; }, formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; } - }); -})(jQuery); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['de']); + ); +})(jQuery); \ No newline at end of file diff --git a/select2_locale_el.js b/select2_locale_el.js index a5d8fed1..f135d92e 100644 --- a/select2_locale_el.js +++ b/select2_locale_el.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); }, formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; }, formatSearching: function () { return "Αναζήτηση…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['el']); + ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index adf3d19f..88e209c3 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -14,5 +14,8 @@ formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Loading more results…"; }, formatSearching: function () { return "Searching…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); + ); })(jQuery); diff --git a/select2_locale_es.js b/select2_locale_es.js index 15d515d3..afaaaa81 100644 --- a/select2_locale_es.js +++ b/select2_locale_es.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; }, formatSearching: function () { return "Buscando…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['es']); + ); })(jQuery); diff --git a/select2_locale_et.js b/select2_locale_et.js index 4a9bc36c..5ff9682e 100644 --- a/select2_locale_et.js +++ b/select2_locale_et.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; }, formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; }, formatSearching: function () { return "Otsin.."; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['et']); + ); })(jQuery); diff --git a/select2_locale_eu.js b/select2_locale_eu.js index 4e8873fa..1825aca1 100644 --- a/select2_locale_eu.js +++ b/select2_locale_eu.js @@ -39,5 +39,8 @@ formatSearching: function () { return "Bilatzen…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']); + ); })(jQuery); diff --git a/select2_locale_fa.js b/select2_locale_fa.js index 6ffbde32..b4570eb8 100644 --- a/select2_locale_fa.js +++ b/select2_locale_fa.js @@ -15,5 +15,8 @@ formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; }, formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; }, formatSearching: function () { return "در حال جستجو…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']); + ); })(jQuery); diff --git a/select2_locale_fi.js b/select2_locale_fi.js index e67407cc..f51d3764 100644 --- a/select2_locale_fi.js +++ b/select2_locale_fi.js @@ -24,5 +24,8 @@ formatSearching: function () { return "Etsitään…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); + ); })(jQuery); diff --git a/select2_locale_fr.js b/select2_locale_fr.js index a9711d47..94ba2551 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -12,5 +12,8 @@ formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; }, formatSearching: function () { return "Recherche en cours…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']); + ); })(jQuery); diff --git a/select2_locale_gl.js b/select2_locale_gl.js index 252fb112..dfc185e8 100644 --- a/select2_locale_gl.js +++ b/select2_locale_gl.js @@ -39,5 +39,8 @@ formatSearching: function () { return "Buscando…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']); + ); })(jQuery); diff --git a/select2_locale_he.js b/select2_locale_he.js index e34ab0b4..da99fc42 100644 --- a/select2_locale_he.js +++ b/select2_locale_he.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "ניתן לבחור " + limit + " פריטים"; }, formatLoadMore: function (pageNumber) { return "טוען תוצאות נוספות…"; }, formatSearching: function () { return "מחפש…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['he']); + ); })(jQuery); diff --git a/select2_locale_hr.js b/select2_locale_hr.js index 1bc19f63..5f79b156 100644 --- a/select2_locale_hr.js +++ b/select2_locale_hr.js @@ -14,7 +14,10 @@ formatSelectionTooBig: function (limit) { return "Maksimalan broj odabranih stavki je " + limit; }, formatLoadMore: function (pageNumber) { return "Učitavanje rezultata…"; }, formatSearching: function () { return "Pretraga…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']); + ); function character (n) { return " " + n + " znak" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "a" : "" : "ova"); diff --git a/select2_locale_hu.js b/select2_locale_hu.js index 69faa999..7f502764 100644 --- a/select2_locale_hu.js +++ b/select2_locale_hu.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Csak " + limit + " elemet lehet kiválasztani."; }, formatLoadMore: function (pageNumber) { return "Töltés…"; }, formatSearching: function () { return "Keresés…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']); + ); })(jQuery); diff --git a/select2_locale_id.js b/select2_locale_id.js index 243f8cf3..62aa6820 100644 --- a/select2_locale_id.js +++ b/select2_locale_id.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Anda hanya dapat memilih " + limit + " pilihan" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Mengambil data…"; }, formatSearching: function () { return "Mencari…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['id']); + ); })(jQuery); diff --git a/select2_locale_is.js b/select2_locale_is.js index 79778d08..bf9a68db 100644 --- a/select2_locale_is.js +++ b/select2_locale_is.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Þú getur aðeins valið " + limit + " atriði"; }, formatLoadMore: function (pageNumber) { return "Sæki fleiri niðurstöður…"; }, formatSearching: function () { return "Leita…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['is']); + ); })(jQuery); diff --git a/select2_locale_it.js b/select2_locale_it.js index 5171c162..d8f9c1f9 100644 --- a/select2_locale_it.js +++ b/select2_locale_it.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Puoi selezionare solo " + limit + " element" + (limit == 1 ? "o" : "i"); }, formatLoadMore: function (pageNumber) { return "Caricamento in corso…"; }, formatSearching: function () { return "Ricerca…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['it']); + ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_ja.js b/select2_locale_ja.js index ddc7abf0..517e2551 100644 --- a/select2_locale_ja.js +++ b/select2_locale_ja.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "最多で" + limit + "項目までしか選択できません"; }, formatLoadMore: function (pageNumber) { return "読込中･･･"; }, formatSearching: function () { return "検索中･･･"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ja']); + ); })(jQuery); diff --git a/select2_locale_ka.js b/select2_locale_ka.js index f36410ae..d2d3bb6b 100644 --- a/select2_locale_ka.js +++ b/select2_locale_ka.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "თქვენ შეგიძლიათ მხოლოდ " + limit + " ჩანაწერის მონიშვნა"; }, formatLoadMore: function (pageNumber) { return "შედეგის ჩატვირთვა…"; }, formatSearching: function () { return "ძებნა…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']); + ); })(jQuery); diff --git a/select2_locale_ko.js b/select2_locale_ko.js index 9324c4bd..5f98112d 100644 --- a/select2_locale_ko.js +++ b/select2_locale_ko.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "최대 "+limit+"개까지만 선택하실 수 있습니다."; }, formatLoadMore: function (pageNumber) { return "불러오는 중…"; }, formatSearching: function () { return "검색 중…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']); + ); })(jQuery); diff --git a/select2_locale_lt.js b/select2_locale_lt.js index f63a7d10..d7d5887b 100644 --- a/select2_locale_lt.js +++ b/select2_locale_lt.js @@ -16,7 +16,10 @@ }, formatLoadMore: function (pageNumber) { return "Kraunama daugiau rezultatų…"; }, formatSearching: function () { return "Ieškoma…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']); + ); function character (n) { return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į"); diff --git a/select2_locale_lv.js b/select2_locale_lv.js index c684876f..b1afde94 100644 --- a/select2_locale_lv.js +++ b/select2_locale_lv.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Jūs varat izvēlēties ne vairāk kā " + limit + " element" + (limit == 11 ? "us" : limit%10 == 1 ? "u" : "us"); }, formatLoadMore: function (pageNumber) { return "Datu ielāde…"; }, formatSearching: function () { return "Meklēšana…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']); + ); })(jQuery); diff --git a/select2_locale_mk.js b/select2_locale_mk.js index 4504f903..005e64fc 100644 --- a/select2_locale_mk.js +++ b/select2_locale_mk.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Можете да изберете само " + limit + " ставк" + (limit == 1 ? "а" : "и"); }, formatLoadMore: function (pageNumber) { return "Вчитување резултати…"; }, formatSearching: function () { return "Пребарување…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']); + ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_ms.js b/select2_locale_ms.js index 21b6a05c..f5342888 100644 --- a/select2_locale_ms.js +++ b/select2_locale_ms.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Anda hanya boleh memilih " + limit + " pilihan"; }, formatLoadMore: function (pageNumber) { return "Sedang memuatkan keputusan…"; }, formatSearching: function () { return "Mencari…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']); + ); })(jQuery); diff --git a/select2_locale_nl.js b/select2_locale_nl.js index 76045317..64ed8ab0 100644 --- a/select2_locale_nl.js +++ b/select2_locale_nl.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Maximaal " + limit + " item" + (limit == 1 ? "" : "s") + " toegestaan"; }, formatLoadMore: function (pageNumber) { return "Meer resultaten laden…"; }, formatSearching: function () { return "Zoeken…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']); + ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_no.js b/select2_locale_no.js index 5e1324d0..270264a4 100644 --- a/select2_locale_no.js +++ b/select2_locale_no.js @@ -13,6 +13,9 @@ formatSelectionTooBig: function (limit) { return "Du kan velge maks " + limit + " elementer"; }, formatLoadMore: function (pageNumber) { return "Laster flere resultater…"; }, formatSearching: function () { return "Søker…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['no']); + ); })(jQuery); diff --git a/select2_locale_pl.js b/select2_locale_pl.js index d647dc9c..eedd0b86 100644 --- a/select2_locale_pl.js +++ b/select2_locale_pl.js @@ -15,7 +15,10 @@ formatSelectionTooBig: function (limit) { return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y"); }, formatLoadMore: function (pageNumber) { return "Ładowanie wyników…"; }, formatSearching: function () { return "Szukanie…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']); + ); function character (n, word, pluralSuffix) { return " " + n + " " + word + (n == 1 ? "" : n%10 < 5 && n%10 > 1 && (n%100 < 5 || n%100 > 20) ? pluralSuffix : "ów"); diff --git a/select2_locale_pt-BR.js b/select2_locale_pt-BR.js index d097054b..2fe1e1ad 100644 --- a/select2_locale_pt-BR.js +++ b/select2_locale_pt-BR.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; }, formatSearching: function () { return "Buscando…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']); + ); })(jQuery); diff --git a/select2_locale_pt-PT.js b/select2_locale_pt-PT.js index ee18349c..c37dc71b 100644 --- a/select2_locale_pt-PT.js +++ b/select2_locale_pt-PT.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "A carregar mais resultados…"; }, formatSearching: function () { return "A pesquisar…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']); + ); })(jQuery); diff --git a/select2_locale_ro.js b/select2_locale_ro.js index 6fb26874..8142c87d 100644 --- a/select2_locale_ro.js +++ b/select2_locale_ro.js @@ -11,5 +11,8 @@ formatSelectionTooBig: function (limit) { return "Aveți voie să selectați cel mult " + limit + " element" + (limit == 1 ? "" : "e"); }, formatLoadMore: function (pageNumber) { return "Se încarcă…"; }, formatSearching: function () { return "Căutare…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']); + ); })(jQuery); diff --git a/select2_locale_rs.js b/select2_locale_rs.js index 97569fc9..bc8f7468 100644 --- a/select2_locale_rs.js +++ b/select2_locale_rs.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Možete izabrati samo " + limit + " stavk" + (limit % 10 == 1 && limit % 100 != 11 ? "u" : (limit % 10 >= 2 && limit % 10 <= 4 && (limit % 100 < 12 || limit % 100 > 14)? "e" : "i")); }, formatLoadMore: function (pageNumber) { return "Preuzimanje još rezultata…"; }, formatSearching: function () { return "Pretraga…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']); + ); })(jQuery); diff --git a/select2_locale_ru.js b/select2_locale_ru.js index 44a36f04..7db981fe 100644 --- a/select2_locale_ru.js +++ b/select2_locale_ru.js @@ -13,7 +13,10 @@ formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); }, formatLoadMore: function (pageNumber) { return "Загрузка данных…"; }, formatSearching: function () { return "Поиск…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']); + ); function character (n) { return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов"); diff --git a/select2_locale_sk.js b/select2_locale_sk.js index 707f5f99..9bc2563a 100644 --- a/select2_locale_sk.js +++ b/select2_locale_sk.js @@ -44,5 +44,8 @@ }, formatLoadMore: function (pageNumber) { return "Načítavajú sa ďalšie výsledky…"; }, formatSearching: function () { return "Vyhľadávanie…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['sk']); + ); })(jQuery); diff --git a/select2_locale_sv.js b/select2_locale_sv.js index 26f6f512..a7a24fda 100644 --- a/select2_locale_sv.js +++ b/select2_locale_sv.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Du kan max välja " + limit + " element"; }, formatLoadMore: function (pageNumber) { return "Laddar fler resultat…"; }, formatSearching: function () { return "Söker…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']); + ); })(jQuery); diff --git a/select2_locale_th.js b/select2_locale_th.js index 7004d2a5..cecf46db 100644 --- a/select2_locale_th.js +++ b/select2_locale_th.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "คุณสามารถเลือกได้ไม่เกิน " + limit + " รายการ"; }, formatLoadMore: function (pageNumber) { return "กำลังค้นข้อมูลเพิ่ม…"; }, formatSearching: function () { return "กำลังค้นข้อมูล…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['th']); + ); })(jQuery); diff --git a/select2_locale_tr.js b/select2_locale_tr.js index e9d7a0aa..bc80121f 100644 --- a/select2_locale_tr.js +++ b/select2_locale_tr.js @@ -13,5 +13,8 @@ formatSelectionTooBig: function (limit) { return "Sadece " + limit + " seçim yapabilirsiniz"; }, formatLoadMore: function (pageNumber) { return "Daha fazla…"; }, formatSearching: function () { return "Aranıyor…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']); + ); })(jQuery); diff --git a/select2_locale_uk.js b/select2_locale_uk.js index cd970b35..22ee3419 100644 --- a/select2_locale_uk.js +++ b/select2_locale_uk.js @@ -15,9 +15,13 @@ formatSelectionTooBig: function (limit) { return "Ви можете вибрати лише " + character(limit, "елемент"); }, formatLoadMore: function (pageNumber) { return "Завантаження даних…"; }, formatSearching: function () { return "Пошук…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']); + ); function character (n, word) { return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів"); } + })(jQuery); diff --git a/select2_locale_vi.js b/select2_locale_vi.js index 1d2dc383..a30af49d 100644 --- a/select2_locale_vi.js +++ b/select2_locale_vi.js @@ -13,6 +13,9 @@ formatSelectionTooBig: function (limit) { return "Chỉ có thể chọn được " + limit + " tùy chọn" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Đang lấy thêm kết quả…"; }, formatSearching: function () { return "Đang tìm…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']); + ); })(jQuery); diff --git a/select2_locale_zh-CN.js b/select2_locale_zh-CN.js index f20332f3..7f1c2b77 100644 --- a/select2_locale_zh-CN.js +++ b/select2_locale_zh-CN.js @@ -10,5 +10,8 @@ formatSelectionTooBig: function (limit) { return "你只能选择最多" + limit + "项"; }, formatLoadMore: function (pageNumber) { return "加载结果中…"; }, formatSearching: function () { return "搜索中…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']); + ); })(jQuery); diff --git a/select2_locale_zh-TW.js b/select2_locale_zh-TW.js index 10fe24ea..d5d5957d 100644 --- a/select2_locale_zh-TW.js +++ b/select2_locale_zh-TW.js @@ -10,5 +10,8 @@ formatSelectionTooBig: function (limit) { return "你只能選擇最多" + limit + "項"; }, formatLoadMore: function (pageNumber) { return "載入中…"; }, formatSearching: function () { return "搜尋中…"; } - }); + } + + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']); + ); })(jQuery); From 8243f8191c012c4e218bcb137a11af668a60ef81 Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Fri, 16 May 2014 10:55:03 +0200 Subject: [PATCH 73/76] Syntax fix Signed-off-by: Kevin Brown --- select2_locale_ar.js | 3 +-- select2_locale_bg.js | 3 +-- select2_locale_ca.js | 3 +-- select2_locale_cs.js | 3 +-- select2_locale_da.js | 3 +-- select2_locale_de.js | 3 +-- select2_locale_el.js | 3 +-- select2_locale_en.js.template | 3 +-- select2_locale_es.js | 3 +-- select2_locale_et.js | 3 +-- select2_locale_eu.js | 3 +-- select2_locale_ka.js | 3 +-- select2_locale_ko.js | 3 +-- select2_locale_lt.js | 3 +-- select2_locale_lv.js | 3 +-- select2_locale_mk.js | 3 +-- select2_locale_ms.js | 3 +-- select2_locale_nl.js | 3 +-- select2_locale_no.js | 3 +-- select2_locale_pl.js | 3 +-- select2_locale_pt-BR.js | 3 +-- select2_locale_pt-PT.js | 3 +-- select2_locale_ro.js | 3 +-- select2_locale_rs.js | 3 +-- select2_locale_ru.js | 3 +-- select2_locale_sk.js | 5 ++--- select2_locale_sv.js | 3 +-- select2_locale_th.js | 3 +-- select2_locale_tr.js | 3 +-- select2_locale_uk.js | 3 +-- select2_locale_vi.js | 3 +-- select2_locale_zh-CN.js | 3 +-- select2_locale_zh-TW.js | 3 +-- 33 files changed, 34 insertions(+), 67 deletions(-) diff --git a/select2_locale_ar.js b/select2_locale_ar.js index 119f89b1..2d32c879 100644 --- a/select2_locale_ar.js +++ b/select2_locale_ar.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { if (n == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return n == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + n + " إختيارات فقط"; }, formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; }, formatSearching: function () { return "البحث…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']); - ); })(jQuery); diff --git a/select2_locale_bg.js b/select2_locale_bg.js index e309aec6..bc069f65 100644 --- a/select2_locale_bg.js +++ b/select2_locale_bg.js @@ -14,8 +14,7 @@ formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); }, formatLoadMore: function (pageNumber) { return "Зареждат се още…"; }, formatSearching: function () { return "Търсене…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']); - ); })(jQuery); diff --git a/select2_locale_ca.js b/select2_locale_ca.js index a6c3a377..b847207c 100644 --- a/select2_locale_ca.js +++ b/select2_locale_ca.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; }, formatSearching: function () { return "S'està cercant…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']); - ); })(jQuery); diff --git a/select2_locale_cs.js b/select2_locale_cs.js index 5fe984f9..ef121856 100644 --- a/select2_locale_cs.js +++ b/select2_locale_cs.js @@ -45,8 +45,7 @@ }, formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; }, formatSearching: function () { return "Vyhledávání…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['cs']); - ); })(jQuery); diff --git a/select2_locale_da.js b/select2_locale_da.js index df95bd32..0ffe57f2 100644 --- a/select2_locale_da.js +++ b/select2_locale_da.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); }, formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; }, formatSearching: function () { return "Søger…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); - ); })(jQuery); diff --git a/select2_locale_de.js b/select2_locale_de.js index 67fa42bd..472eb650 100644 --- a/select2_locale_de.js +++ b/select2_locale_de.js @@ -12,8 +12,7 @@ formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; }, formatSearching: function () { return "Suche…"; }, formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['de']); - ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_el.js b/select2_locale_el.js index f135d92e..74d45561 100644 --- a/select2_locale_el.js +++ b/select2_locale_el.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); }, formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; }, formatSearching: function () { return "Αναζήτηση…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['el']); - ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index 88e209c3..1979a202 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -14,8 +14,7 @@ formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Loading more results…"; }, formatSearching: function () { return "Searching…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); - ); })(jQuery); diff --git a/select2_locale_es.js b/select2_locale_es.js index afaaaa81..c1ac945e 100644 --- a/select2_locale_es.js +++ b/select2_locale_es.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; }, formatSearching: function () { return "Buscando…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['es']); - ); })(jQuery); diff --git a/select2_locale_et.js b/select2_locale_et.js index 5ff9682e..8e6582eb 100644 --- a/select2_locale_et.js +++ b/select2_locale_et.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; }, formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; }, formatSearching: function () { return "Otsin.."; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['et']); - ); })(jQuery); diff --git a/select2_locale_eu.js b/select2_locale_eu.js index 1825aca1..e4336ca5 100644 --- a/select2_locale_eu.js +++ b/select2_locale_eu.js @@ -39,8 +39,7 @@ formatSearching: function () { return "Bilatzen…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']); - ); })(jQuery); diff --git a/select2_locale_ka.js b/select2_locale_ka.js index d2d3bb6b..e64594bf 100644 --- a/select2_locale_ka.js +++ b/select2_locale_ka.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "თქვენ შეგიძლიათ მხოლოდ " + limit + " ჩანაწერის მონიშვნა"; }, formatLoadMore: function (pageNumber) { return "შედეგის ჩატვირთვა…"; }, formatSearching: function () { return "ძებნა…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']); - ); })(jQuery); diff --git a/select2_locale_ko.js b/select2_locale_ko.js index 5f98112d..da1dbf81 100644 --- a/select2_locale_ko.js +++ b/select2_locale_ko.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "최대 "+limit+"개까지만 선택하실 수 있습니다."; }, formatLoadMore: function (pageNumber) { return "불러오는 중…"; }, formatSearching: function () { return "검색 중…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']); - ); })(jQuery); diff --git a/select2_locale_lt.js b/select2_locale_lt.js index d7d5887b..5bdb1482 100644 --- a/select2_locale_lt.js +++ b/select2_locale_lt.js @@ -16,10 +16,9 @@ }, formatLoadMore: function (pageNumber) { return "Kraunama daugiau rezultatų…"; }, formatSearching: function () { return "Ieškoma…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']); - ); function character (n) { return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į"); diff --git a/select2_locale_lv.js b/select2_locale_lv.js index b1afde94..286c9626 100644 --- a/select2_locale_lv.js +++ b/select2_locale_lv.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Jūs varat izvēlēties ne vairāk kā " + limit + " element" + (limit == 11 ? "us" : limit%10 == 1 ? "u" : "us"); }, formatLoadMore: function (pageNumber) { return "Datu ielāde…"; }, formatSearching: function () { return "Meklēšana…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']); - ); })(jQuery); diff --git a/select2_locale_mk.js b/select2_locale_mk.js index 005e64fc..af3395b1 100644 --- a/select2_locale_mk.js +++ b/select2_locale_mk.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Можете да изберете само " + limit + " ставк" + (limit == 1 ? "а" : "и"); }, formatLoadMore: function (pageNumber) { return "Вчитување резултати…"; }, formatSearching: function () { return "Пребарување…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']); - ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_ms.js b/select2_locale_ms.js index f5342888..76166345 100644 --- a/select2_locale_ms.js +++ b/select2_locale_ms.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Anda hanya boleh memilih " + limit + " pilihan"; }, formatLoadMore: function (pageNumber) { return "Sedang memuatkan keputusan…"; }, formatSearching: function () { return "Mencari…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']); - ); })(jQuery); diff --git a/select2_locale_nl.js b/select2_locale_nl.js index 64ed8ab0..de841c78 100644 --- a/select2_locale_nl.js +++ b/select2_locale_nl.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Maximaal " + limit + " item" + (limit == 1 ? "" : "s") + " toegestaan"; }, formatLoadMore: function (pageNumber) { return "Meer resultaten laden…"; }, formatSearching: function () { return "Zoeken…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']); - ); })(jQuery); \ No newline at end of file diff --git a/select2_locale_no.js b/select2_locale_no.js index 270264a4..bde066e9 100644 --- a/select2_locale_no.js +++ b/select2_locale_no.js @@ -13,9 +13,8 @@ formatSelectionTooBig: function (limit) { return "Du kan velge maks " + limit + " elementer"; }, formatLoadMore: function (pageNumber) { return "Laster flere resultater…"; }, formatSearching: function () { return "Søker…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['no']); - ); })(jQuery); diff --git a/select2_locale_pl.js b/select2_locale_pl.js index eedd0b86..1d429296 100644 --- a/select2_locale_pl.js +++ b/select2_locale_pl.js @@ -15,10 +15,9 @@ formatSelectionTooBig: function (limit) { return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y"); }, formatLoadMore: function (pageNumber) { return "Ładowanie wyników…"; }, formatSearching: function () { return "Szukanie…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']); - ); function character (n, word, pluralSuffix) { return " " + n + " " + word + (n == 1 ? "" : n%10 < 5 && n%10 > 1 && (n%100 < 5 || n%100 > 20) ? pluralSuffix : "ów"); diff --git a/select2_locale_pt-BR.js b/select2_locale_pt-BR.js index 2fe1e1ad..d0c9bc2e 100644 --- a/select2_locale_pt-BR.js +++ b/select2_locale_pt-BR.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; }, formatSearching: function () { return "Buscando…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']); - ); })(jQuery); diff --git a/select2_locale_pt-PT.js b/select2_locale_pt-PT.js index c37dc71b..ad3c7c48 100644 --- a/select2_locale_pt-PT.js +++ b/select2_locale_pt-PT.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "A carregar mais resultados…"; }, formatSearching: function () { return "A pesquisar…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']); - ); })(jQuery); diff --git a/select2_locale_ro.js b/select2_locale_ro.js index 8142c87d..a488bac8 100644 --- a/select2_locale_ro.js +++ b/select2_locale_ro.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Aveți voie să selectați cel mult " + limit + " element" + (limit == 1 ? "" : "e"); }, formatLoadMore: function (pageNumber) { return "Se încarcă…"; }, formatSearching: function () { return "Căutare…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']); - ); })(jQuery); diff --git a/select2_locale_rs.js b/select2_locale_rs.js index bc8f7468..1eac36d6 100644 --- a/select2_locale_rs.js +++ b/select2_locale_rs.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Možete izabrati samo " + limit + " stavk" + (limit % 10 == 1 && limit % 100 != 11 ? "u" : (limit % 10 >= 2 && limit % 10 <= 4 && (limit % 100 < 12 || limit % 100 > 14)? "e" : "i")); }, formatLoadMore: function (pageNumber) { return "Preuzimanje još rezultata…"; }, formatSearching: function () { return "Pretraga…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']); - ); })(jQuery); diff --git a/select2_locale_ru.js b/select2_locale_ru.js index 7db981fe..06993d5f 100644 --- a/select2_locale_ru.js +++ b/select2_locale_ru.js @@ -13,10 +13,9 @@ formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); }, formatLoadMore: function (pageNumber) { return "Загрузка данных…"; }, formatSearching: function () { return "Поиск…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']); - ); function character (n) { return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов"); diff --git a/select2_locale_sk.js b/select2_locale_sk.js index 9bc2563a..10d2b503 100644 --- a/select2_locale_sk.js +++ b/select2_locale_sk.js @@ -10,7 +10,7 @@ 2: function(masc) { return (masc ? "dva" : "dve"); }, 3: function() { return "tri"; }, 4: function() { return "štyri"; } - } + }; $.fn.select2.locales['sk'] = { formatNoMatches: function () { return "Nenašli sa žiadne položky"; }, formatInputTooShort: function (input, min) { @@ -44,8 +44,7 @@ }, formatLoadMore: function (pageNumber) { return "Načítavajú sa ďalšie výsledky…"; }, formatSearching: function () { return "Vyhľadávanie…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['sk']); - ); })(jQuery); diff --git a/select2_locale_sv.js b/select2_locale_sv.js index a7a24fda..426e0411 100644 --- a/select2_locale_sv.js +++ b/select2_locale_sv.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Du kan max välja " + limit + " element"; }, formatLoadMore: function (pageNumber) { return "Laddar fler resultat…"; }, formatSearching: function () { return "Söker…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']); - ); })(jQuery); diff --git a/select2_locale_th.js b/select2_locale_th.js index cecf46db..09270b14 100644 --- a/select2_locale_th.js +++ b/select2_locale_th.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "คุณสามารถเลือกได้ไม่เกิน " + limit + " รายการ"; }, formatLoadMore: function (pageNumber) { return "กำลังค้นข้อมูลเพิ่ม…"; }, formatSearching: function () { return "กำลังค้นข้อมูล…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['th']); - ); })(jQuery); diff --git a/select2_locale_tr.js b/select2_locale_tr.js index bc80121f..33f47919 100644 --- a/select2_locale_tr.js +++ b/select2_locale_tr.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Sadece " + limit + " seçim yapabilirsiniz"; }, formatLoadMore: function (pageNumber) { return "Daha fazla…"; }, formatSearching: function () { return "Aranıyor…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']); - ); })(jQuery); diff --git a/select2_locale_uk.js b/select2_locale_uk.js index 22ee3419..fbcd078d 100644 --- a/select2_locale_uk.js +++ b/select2_locale_uk.js @@ -15,10 +15,9 @@ formatSelectionTooBig: function (limit) { return "Ви можете вибрати лише " + character(limit, "елемент"); }, formatLoadMore: function (pageNumber) { return "Завантаження даних…"; }, formatSearching: function () { return "Пошук…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']); - ); function character (n, word) { return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів"); diff --git a/select2_locale_vi.js b/select2_locale_vi.js index a30af49d..90c33eb0 100644 --- a/select2_locale_vi.js +++ b/select2_locale_vi.js @@ -13,9 +13,8 @@ formatSelectionTooBig: function (limit) { return "Chỉ có thể chọn được " + limit + " tùy chọn" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Đang lấy thêm kết quả…"; }, formatSearching: function () { return "Đang tìm…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']); - ); })(jQuery); diff --git a/select2_locale_zh-CN.js b/select2_locale_zh-CN.js index 7f1c2b77..4f6638fa 100644 --- a/select2_locale_zh-CN.js +++ b/select2_locale_zh-CN.js @@ -10,8 +10,7 @@ formatSelectionTooBig: function (limit) { return "你只能选择最多" + limit + "项"; }, formatLoadMore: function (pageNumber) { return "加载结果中…"; }, formatSearching: function () { return "搜索中…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']); - ); })(jQuery); diff --git a/select2_locale_zh-TW.js b/select2_locale_zh-TW.js index d5d5957d..46608edd 100644 --- a/select2_locale_zh-TW.js +++ b/select2_locale_zh-TW.js @@ -10,8 +10,7 @@ formatSelectionTooBig: function (limit) { return "你只能選擇最多" + limit + "項"; }, formatLoadMore: function (pageNumber) { return "載入中…"; }, formatSearching: function () { return "搜尋中…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']); - ); })(jQuery); From e2e476c1964a6e3edf781a59f50924fbd3ffd763 Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Fri, 16 May 2014 11:02:10 +0200 Subject: [PATCH 74/76] Remaining syntax + indentation Signed-off-by: Kevin Brown --- select2_locale_ar.js | 2 +- select2_locale_bg.js | 2 +- select2_locale_ca.js | 2 +- select2_locale_da.js | 2 +- select2_locale_de.js | 2 +- select2_locale_el.js | 2 +- select2_locale_en.js.template | 2 +- select2_locale_es.js | 2 +- select2_locale_et.js | 2 +- select2_locale_eu.js | 2 +- select2_locale_fa.js | 3 +-- select2_locale_fi.js | 3 +-- select2_locale_fr.js | 3 +-- select2_locale_gl.js | 3 +-- select2_locale_he.js | 3 +-- select2_locale_hr.js | 3 +-- select2_locale_hu.js | 6 +++--- select2_locale_id.js | 5 ++--- select2_locale_is.js | 5 ++--- select2_locale_it.js | 5 ++--- select2_locale_ja.js | 5 ++--- select2_locale_ka.js | 2 +- select2_locale_ko.js | 2 +- select2_locale_lt.js | 2 +- select2_locale_lv.js | 2 +- select2_locale_mk.js | 2 +- select2_locale_ms.js | 2 +- select2_locale_nl.js | 2 +- select2_locale_no.js | 2 +- select2_locale_pl.js | 2 +- select2_locale_pt-BR.js | 2 +- select2_locale_pt-PT.js | 2 +- select2_locale_ro.js | 2 +- select2_locale_rs.js | 2 +- select2_locale_ru.js | 2 +- select2_locale_sv.js | 2 +- select2_locale_th.js | 2 +- select2_locale_tr.js | 2 +- select2_locale_uk.js | 2 +- select2_locale_vi.js | 2 +- select2_locale_zh-CN.js | 2 +- select2_locale_zh-TW.js | 2 +- 42 files changed, 48 insertions(+), 58 deletions(-) diff --git a/select2_locale_ar.js b/select2_locale_ar.js index 2d32c879..f9fbaa16 100644 --- a/select2_locale_ar.js +++ b/select2_locale_ar.js @@ -15,5 +15,5 @@ formatSearching: function () { return "البحث…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']); })(jQuery); diff --git a/select2_locale_bg.js b/select2_locale_bg.js index bc069f65..3283d0ae 100644 --- a/select2_locale_bg.js +++ b/select2_locale_bg.js @@ -16,5 +16,5 @@ formatSearching: function () { return "Търсене…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']); })(jQuery); diff --git a/select2_locale_ca.js b/select2_locale_ca.js index b847207c..dbea39e9 100644 --- a/select2_locale_ca.js +++ b/select2_locale_ca.js @@ -15,5 +15,5 @@ formatSearching: function () { return "S'està cercant…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']); })(jQuery); diff --git a/select2_locale_da.js b/select2_locale_da.js index 0ffe57f2..c636a774 100644 --- a/select2_locale_da.js +++ b/select2_locale_da.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Søger…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); })(jQuery); diff --git a/select2_locale_de.js b/select2_locale_de.js index 472eb650..e2754172 100644 --- a/select2_locale_de.js +++ b/select2_locale_de.js @@ -14,5 +14,5 @@ formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['de']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['de']); })(jQuery); \ No newline at end of file diff --git a/select2_locale_el.js b/select2_locale_el.js index 74d45561..d17459e1 100644 --- a/select2_locale_el.js +++ b/select2_locale_el.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Αναζήτηση…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['el']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['el']); })(jQuery); \ No newline at end of file diff --git a/select2_locale_en.js.template b/select2_locale_en.js.template index 1979a202..f758b110 100644 --- a/select2_locale_en.js.template +++ b/select2_locale_en.js.template @@ -16,5 +16,5 @@ formatSearching: function () { return "Searching…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['en']); })(jQuery); diff --git a/select2_locale_es.js b/select2_locale_es.js index c1ac945e..b506fbcd 100644 --- a/select2_locale_es.js +++ b/select2_locale_es.js @@ -13,5 +13,5 @@ formatSearching: function () { return "Buscando…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['es']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['es']); })(jQuery); diff --git a/select2_locale_et.js b/select2_locale_et.js index 8e6582eb..4d69f55e 100644 --- a/select2_locale_et.js +++ b/select2_locale_et.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Otsin.."; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['et']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['et']); })(jQuery); diff --git a/select2_locale_eu.js b/select2_locale_eu.js index e4336ca5..67ae8d05 100644 --- a/select2_locale_eu.js +++ b/select2_locale_eu.js @@ -41,5 +41,5 @@ } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']); })(jQuery); diff --git a/select2_locale_fa.js b/select2_locale_fa.js index b4570eb8..a49938ac 100644 --- a/select2_locale_fa.js +++ b/select2_locale_fa.js @@ -17,6 +17,5 @@ formatSearching: function () { return "در حال جستجو…"; } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']); })(jQuery); diff --git a/select2_locale_fi.js b/select2_locale_fi.js index f51d3764..fe4aaf09 100644 --- a/select2_locale_fi.js +++ b/select2_locale_fi.js @@ -26,6 +26,5 @@ } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); })(jQuery); diff --git a/select2_locale_fr.js b/select2_locale_fr.js index 94ba2551..fe475772 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -14,6 +14,5 @@ formatSearching: function () { return "Recherche en cours…"; } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']); })(jQuery); diff --git a/select2_locale_gl.js b/select2_locale_gl.js index dfc185e8..13537f32 100644 --- a/select2_locale_gl.js +++ b/select2_locale_gl.js @@ -41,6 +41,5 @@ } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']); })(jQuery); diff --git a/select2_locale_he.js b/select2_locale_he.js index da99fc42..8322ca5e 100644 --- a/select2_locale_he.js +++ b/select2_locale_he.js @@ -15,6 +15,5 @@ formatSearching: function () { return "מחפש…"; } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['he']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['he']); })(jQuery); diff --git a/select2_locale_hr.js b/select2_locale_hr.js index 5f79b156..955accd5 100644 --- a/select2_locale_hr.js +++ b/select2_locale_hr.js @@ -16,8 +16,7 @@ formatSearching: function () { return "Pretraga…"; } } - $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']); function character (n) { return " " + n + " znak" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "a" : "" : "ova"); diff --git a/select2_locale_hu.js b/select2_locale_hu.js index 7f502764..94ee4f61 100644 --- a/select2_locale_hu.js +++ b/select2_locale_hu.js @@ -11,8 +11,8 @@ formatSelectionTooBig: function (limit) { return "Csak " + limit + " elemet lehet kiválasztani."; }, formatLoadMore: function (pageNumber) { return "Töltés…"; }, formatSearching: function () { return "Keresés…"; } - } + }; + + $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']); - $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']); - ); })(jQuery); diff --git a/select2_locale_id.js b/select2_locale_id.js index 62aa6820..e9c1fd9b 100644 --- a/select2_locale_id.js +++ b/select2_locale_id.js @@ -13,8 +13,7 @@ formatSelectionTooBig: function (limit) { return "Anda hanya dapat memilih " + limit + " pilihan" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Mengambil data…"; }, formatSearching: function () { return "Mencari…"; } - } + }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['id']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['id']); })(jQuery); diff --git a/select2_locale_is.js b/select2_locale_is.js index bf9a68db..273f33de 100644 --- a/select2_locale_is.js +++ b/select2_locale_is.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Þú getur aðeins valið " + limit + " atriði"; }, formatLoadMore: function (pageNumber) { return "Sæki fleiri niðurstöður…"; }, formatSearching: function () { return "Leita…"; } - } + }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['is']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['is']); })(jQuery); diff --git a/select2_locale_it.js b/select2_locale_it.js index d8f9c1f9..6e2b8e23 100644 --- a/select2_locale_it.js +++ b/select2_locale_it.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "Puoi selezionare solo " + limit + " element" + (limit == 1 ? "o" : "i"); }, formatLoadMore: function (pageNumber) { return "Caricamento in corso…"; }, formatSearching: function () { return "Ricerca…"; } - } + }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['it']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['it']); })(jQuery); \ No newline at end of file diff --git a/select2_locale_ja.js b/select2_locale_ja.js index 517e2551..7dbd8d7e 100644 --- a/select2_locale_ja.js +++ b/select2_locale_ja.js @@ -11,8 +11,7 @@ formatSelectionTooBig: function (limit) { return "最多で" + limit + "項目までしか選択できません"; }, formatLoadMore: function (pageNumber) { return "読込中･･･"; }, formatSearching: function () { return "検索中･･･"; } - } + }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ja']); - ); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ja']); })(jQuery); diff --git a/select2_locale_ka.js b/select2_locale_ka.js index e64594bf..6cbe1d8f 100644 --- a/select2_locale_ka.js +++ b/select2_locale_ka.js @@ -15,5 +15,5 @@ formatSearching: function () { return "ძებნა…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']); })(jQuery); diff --git a/select2_locale_ko.js b/select2_locale_ko.js index da1dbf81..bf036e09 100644 --- a/select2_locale_ko.js +++ b/select2_locale_ko.js @@ -15,5 +15,5 @@ formatSearching: function () { return "검색 중…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']); })(jQuery); diff --git a/select2_locale_lt.js b/select2_locale_lt.js index 5bdb1482..7d7040f7 100644 --- a/select2_locale_lt.js +++ b/select2_locale_lt.js @@ -18,7 +18,7 @@ formatSearching: function () { return "Ieškoma…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']); function character (n) { return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į"); diff --git a/select2_locale_lv.js b/select2_locale_lv.js index 286c9626..4afc5b41 100644 --- a/select2_locale_lv.js +++ b/select2_locale_lv.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Meklēšana…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']); })(jQuery); diff --git a/select2_locale_mk.js b/select2_locale_mk.js index af3395b1..8a51a9e0 100644 --- a/select2_locale_mk.js +++ b/select2_locale_mk.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Пребарување…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']); })(jQuery); \ No newline at end of file diff --git a/select2_locale_ms.js b/select2_locale_ms.js index 76166345..46588d6d 100644 --- a/select2_locale_ms.js +++ b/select2_locale_ms.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Mencari…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']); })(jQuery); diff --git a/select2_locale_nl.js b/select2_locale_nl.js index de841c78..4e283af4 100644 --- a/select2_locale_nl.js +++ b/select2_locale_nl.js @@ -13,5 +13,5 @@ formatSearching: function () { return "Zoeken…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']); })(jQuery); \ No newline at end of file diff --git a/select2_locale_no.js b/select2_locale_no.js index bde066e9..e00408cf 100644 --- a/select2_locale_no.js +++ b/select2_locale_no.js @@ -15,6 +15,6 @@ formatSearching: function () { return "Søker…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['no']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['no']); })(jQuery); diff --git a/select2_locale_pl.js b/select2_locale_pl.js index 1d429296..d77648ff 100644 --- a/select2_locale_pl.js +++ b/select2_locale_pl.js @@ -17,7 +17,7 @@ formatSearching: function () { return "Szukanie…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']); function character (n, word, pluralSuffix) { return " " + n + " " + word + (n == 1 ? "" : n%10 < 5 && n%10 > 1 && (n%100 < 5 || n%100 > 20) ? pluralSuffix : "ów"); diff --git a/select2_locale_pt-BR.js b/select2_locale_pt-BR.js index d0c9bc2e..e4088f0c 100644 --- a/select2_locale_pt-BR.js +++ b/select2_locale_pt-BR.js @@ -13,5 +13,5 @@ formatSearching: function () { return "Buscando…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']); })(jQuery); diff --git a/select2_locale_pt-PT.js b/select2_locale_pt-PT.js index ad3c7c48..ae55a4fc 100644 --- a/select2_locale_pt-PT.js +++ b/select2_locale_pt-PT.js @@ -13,5 +13,5 @@ formatSearching: function () { return "A pesquisar…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']); })(jQuery); diff --git a/select2_locale_ro.js b/select2_locale_ro.js index a488bac8..21b0cf18 100644 --- a/select2_locale_ro.js +++ b/select2_locale_ro.js @@ -13,5 +13,5 @@ formatSearching: function () { return "Căutare…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']); })(jQuery); diff --git a/select2_locale_rs.js b/select2_locale_rs.js index 1eac36d6..72c16389 100644 --- a/select2_locale_rs.js +++ b/select2_locale_rs.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Pretraga…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']); })(jQuery); diff --git a/select2_locale_ru.js b/select2_locale_ru.js index 06993d5f..2a6c7702 100644 --- a/select2_locale_ru.js +++ b/select2_locale_ru.js @@ -15,7 +15,7 @@ formatSearching: function () { return "Поиск…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']); function character (n) { return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов"); diff --git a/select2_locale_sv.js b/select2_locale_sv.js index 426e0411..96f8c0a8 100644 --- a/select2_locale_sv.js +++ b/select2_locale_sv.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Söker…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']); })(jQuery); diff --git a/select2_locale_th.js b/select2_locale_th.js index 09270b14..7f3e6ef8 100644 --- a/select2_locale_th.js +++ b/select2_locale_th.js @@ -15,5 +15,5 @@ formatSearching: function () { return "กำลังค้นข้อมูล…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['th']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['th']); })(jQuery); diff --git a/select2_locale_tr.js b/select2_locale_tr.js index 33f47919..1dda95ca 100644 --- a/select2_locale_tr.js +++ b/select2_locale_tr.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Aranıyor…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']); })(jQuery); diff --git a/select2_locale_uk.js b/select2_locale_uk.js index fbcd078d..f76bcfd8 100644 --- a/select2_locale_uk.js +++ b/select2_locale_uk.js @@ -17,7 +17,7 @@ formatSearching: function () { return "Пошук…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']); function character (n, word) { return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів"); diff --git a/select2_locale_vi.js b/select2_locale_vi.js index 90c33eb0..cc67065f 100644 --- a/select2_locale_vi.js +++ b/select2_locale_vi.js @@ -15,6 +15,6 @@ formatSearching: function () { return "Đang tìm…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']); })(jQuery); diff --git a/select2_locale_zh-CN.js b/select2_locale_zh-CN.js index 4f6638fa..e988dac1 100644 --- a/select2_locale_zh-CN.js +++ b/select2_locale_zh-CN.js @@ -12,5 +12,5 @@ formatSearching: function () { return "搜索中…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']); })(jQuery); diff --git a/select2_locale_zh-TW.js b/select2_locale_zh-TW.js index 46608edd..85dbd5af 100644 --- a/select2_locale_zh-TW.js +++ b/select2_locale_zh-TW.js @@ -12,5 +12,5 @@ formatSearching: function () { return "搜尋中…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']); })(jQuery); From 8fc069df450fcf0e0257ef99ed2f9cd64faac86e Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Fri, 16 May 2014 11:06:58 +0200 Subject: [PATCH 75/76] Added some missing ; Signed-off-by: Kevin Brown --- select2_locale_fa.js | 2 +- select2_locale_fi.js | 2 +- select2_locale_fr.js | 2 +- select2_locale_gl.js | 2 +- select2_locale_he.js | 2 +- select2_locale_hr.js | 2 +- select2_locale_hu.js | 1 - select2_locale_uk.js | 1 - 8 files changed, 6 insertions(+), 8 deletions(-) diff --git a/select2_locale_fa.js b/select2_locale_fa.js index a49938ac..b3ffd8b7 100644 --- a/select2_locale_fa.js +++ b/select2_locale_fa.js @@ -15,7 +15,7 @@ formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; }, formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; }, formatSearching: function () { return "در حال جستجو…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']); })(jQuery); diff --git a/select2_locale_fi.js b/select2_locale_fi.js index fe4aaf09..6487fbda 100644 --- a/select2_locale_fi.js +++ b/select2_locale_fi.js @@ -24,7 +24,7 @@ formatSearching: function () { return "Etsitään…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); })(jQuery); diff --git a/select2_locale_fr.js b/select2_locale_fr.js index fe475772..d5485d6b 100644 --- a/select2_locale_fr.js +++ b/select2_locale_fr.js @@ -12,7 +12,7 @@ formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; }, formatSearching: function () { return "Recherche en cours…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']); })(jQuery); diff --git a/select2_locale_gl.js b/select2_locale_gl.js index 13537f32..9335167d 100644 --- a/select2_locale_gl.js +++ b/select2_locale_gl.js @@ -39,7 +39,7 @@ formatSearching: function () { return "Buscando…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']); })(jQuery); diff --git a/select2_locale_he.js b/select2_locale_he.js index 8322ca5e..789dcdca 100644 --- a/select2_locale_he.js +++ b/select2_locale_he.js @@ -13,7 +13,7 @@ formatSelectionTooBig: function (limit) { return "ניתן לבחור " + limit + " פריטים"; }, formatLoadMore: function (pageNumber) { return "טוען תוצאות נוספות…"; }, formatSearching: function () { return "מחפש…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['he']); })(jQuery); diff --git a/select2_locale_hr.js b/select2_locale_hr.js index 955accd5..ce8051c7 100644 --- a/select2_locale_hr.js +++ b/select2_locale_hr.js @@ -14,7 +14,7 @@ formatSelectionTooBig: function (limit) { return "Maksimalan broj odabranih stavki je " + limit; }, formatLoadMore: function (pageNumber) { return "Učitavanje rezultata…"; }, formatSearching: function () { return "Pretraga…"; } - } + }; $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']); diff --git a/select2_locale_hu.js b/select2_locale_hu.js index 94ee4f61..f431f246 100644 --- a/select2_locale_hu.js +++ b/select2_locale_hu.js @@ -14,5 +14,4 @@ }; $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']); - })(jQuery); diff --git a/select2_locale_uk.js b/select2_locale_uk.js index f76bcfd8..b5bd0e02 100644 --- a/select2_locale_uk.js +++ b/select2_locale_uk.js @@ -22,5 +22,4 @@ function character (n, word) { return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів"); } - })(jQuery); From 6de07310c88e5f534bbe5886639042b226a43cca Mon Sep 17 00:00:00 2001 From: Jonas Pyfferoen Date: Tue, 20 May 2014 09:46:53 +0200 Subject: [PATCH 76/76] Fix da language apply Signed-off-by: Kevin Brown --- select2_locale_da.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2_locale_da.js b/select2_locale_da.js index c636a774..702238b9 100644 --- a/select2_locale_da.js +++ b/select2_locale_da.js @@ -15,5 +15,5 @@ formatSearching: function () { return "Søger…"; } }; - $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']); + $.extend($.fn.select2.defaults, $.fn.select2.locales['da']); })(jQuery);