kallithea Changeset - 304e83e9bcde

Changeset - 304e83e9bcde

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-06-10 01:19:58
madski@unity3d.com

js: update select2 to 3.5.4

(4.x seems like a more major upgrade - we stick to the 3 series for now.)

Note that select2-bootstrap.css *not* is upgraded. It is a separate thing (see
LICENSE.md) and currently unused. (Select2 now has similar functionality built
in - that should perhaps be used with Bootstrap instead.)

2 files changed with 350 insertions and 110 deletions:

kallithea/public/js/select2/select2.css

kallithea/public/js/select2/select2.js

342

0 comments (0 inline, 0 general)

kallithea/public/js/select2/select2.css

➞

Show inline comments

 /*
-Version: 3.5.0 Timestamp: Mon Jun 16 19:29:44 EDT 2014
+Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
 */
 .select2-container {
     margin: 0;
     position: relative;
     display: inline-block;
     /* inline-block for ie7 */
     zoom: 1;
     *display: inline;
     vertical-align: middle;
+}
 .select2-container,
 .select2-drop,
 .select2-search,
 .select2-search input {
   /*
     Force border-box so that % widths fit the parent
     container without overlap because of margin/padding.
     More Info : http://www.quirksmode.org/css/box.html
   */
   -webkit-box-sizing: border-box; /* webkit */
      -moz-box-sizing: border-box; /* firefox */
           box-sizing: border-box; /* css3 */
+}
 .select2-container .select2-choice {
     display: block;
     height: 26px;
     padding: 0 0 0 8px;
     overflow: hidden;
     position: relative;
@@ @@ -159,145 +156,136 @@ html[dir="rtl"] .select2-container .sele @@
     margin-top: 1px;
     border-top: 1px solid #aaa;
     border-bottom: 0;
     border-radius: 4px 4px 0 0;
     -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
             box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
 .select2-drop-active {
     border: 1px solid #5897fb;
     border-top: none;
+}
 .select2-drop.select2-drop-above.select2-drop-active {
     border-top: 1px solid #5897fb;
+}
 .select2-drop-auto-width {
     border-top: 1px solid #aaa;
     width: auto;
+}
 .select2-drop-auto-width .select2-search {
     padding-top: 4px;
+}
 .select2-container .select2-choice .select2-arrow {
     display: inline-block;
     width: 18px;
     height: 100%;
     position: absolute;
     right: 0;
     top: 0;
     border-left: 1px solid #aaa;
     border-radius: 0 4px 4px 0;
     background-clip: padding-box;
     background: #ccc;
     background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
     background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
     background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0);
     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%;
     height: 100%;
     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%;
     min-height: 26px;
     margin: 0;
     padding-left: 4px;
     padding-right: 4px;
     padding: 4px 4px 0 4px;
     position: relative;
     z-index: 10000;
     white-space: nowrap;
+}
 .select2-search input {
     width: 100%;
     height: auto !important;
     min-height: 26px;
     padding: 4px 20px 4px 5px;
     margin: 0;
     outline: 0;
     font-family: sans-serif;
     font-size: 1em;
     border: 1px solid #aaa;
     border-radius: 0;
     -webkit-box-shadow: none;
             box-shadow: none;
     background: #fff url('select2.png') no-repeat 100% -22px;
     background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
     background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
     background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
     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;
+}
 .select2-search input.select2-active {
     background: #fff url('select2-spinner.gif') no-repeat 100%;
     background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
     background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
     background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
     background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+}
 .select2-container-active .select2-choice,
 .select2-container-active .select2-choices {
     border: 1px solid #5897fb;
     outline: none;
     -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
             box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+}
 .select2-dropdown-open .select2-choice {
     border-bottom-color: transparent;
     -webkit-box-shadow: 0 1px 0 #fff inset;
             box-shadow: 0 1px 0 #fff inset;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
@@ @@ -401,80 +389,84 @@ html[dir="rtl"] .select2-results { @@
 .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;
     color: #fff;
+}
 .select2-results li em {
     background: #feffde;
     font-style: normal;
+}
 .select2-results .select2-highlighted em {
     background: transparent;
+}
 .select2-results .select2-highlighted ul {
     background: #fff;
     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;
     padding-left: 5px;
+}
 /*
 disabled look for disabled choices in the results dropdown
 */
 .select2-results .select2-disabled.select2-highlighted {
     color: #666;
     background: #f4f4f4;
     display: list-item;
     cursor: default;
+}
 .select2-results .select2-disabled {
   background: #f4f4f4;
   display: list-item;
   cursor: default;
+}
 .select2-results .select2-selected {
     display: none;
+}
 .select2-more-results.select2-active {
     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;
+}
 /* disabled styles */
 .select2-container.select2-container-disabled .select2-choice {
     background-color: #f4f4f4;
     background-image: none;
     border: 1px solid #ddd;
     cursor: default;
+}
 .select2-container.select2-container-disabled .select2-choice .select2-arrow {
     background-color: #f4f4f4;
     background-image: none;
     border-left: 0;
+}
 .select2-container.select2-container-disabled .select2-choice abbr {
     display: none;
+}
@@ @@ -561,49 +553,49 @@ html[dir="rtl"] .select2-container-multi @@
     line-height: 13px;
     color: #333;
     cursor: default;
     border: 1px solid #aaaaaa;
     border-radius: 3px;
     -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
             box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
     background-clip: padding-box;
     -webkit-touch-callout: none;
       -webkit-user-select: none;
          -moz-user-select: none;
           -ms-user-select: none;
               user-select: none;
     background-color: #e4e4e4;
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
     background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
     background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
-    background-image: linear-gradient(to top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
 html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
+{
     margin: 3px 5px 3px 0;
     padding: 3px 18px 3px 5px;
+}
 .select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
     cursor: default;
+}
 .select2-container-multi .select2-choices .select2-search-choice-focus {
     background: #d4d4d4;
+}
 .select2-search-choice-close {
     display: block;
     width: 12px;
     height: 13px;
     position: absolute;
     right: 3px;
     top: 4px;
     font-size: 1px;
     outline: none;
     background: url('select2.png') right top no-repeat;

kallithea/public/js/select2/select2.js

➞

Show inline comments

 /*
 Copyright 2012 Igor Vaynberg
-Version: 3.5.0 Timestamp: Mon Jun 16 19:29:44 EDT 2014
+Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
 This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
 General Public License version 2 (the "GPL License"). You may choose either license to govern your
 use of this software only upon the condition that you accept all of the terms of either the Apache
 License or the GPL License.
 You may obtain a copy of the Apache License and the GPL License at:
     http://www.apache.org/licenses/LICENSE-2.0
     http://www.gnu.org/licenses/gpl-2.0.html
 Unless required by applicable law or agreed to in writing, software distributed under the
 Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
 the specific language governing permissions and limitations under the Apache License and the GPL License.
 */
 (function ($) {
     if(typeof $.fn.each2 == "undefined") {
         $.extend($.fn, {
             /*
             * 4-10 times faster .each replacement
             * use it carefully, as it overrides jQuery context of element on each iteration
             */
             each2 : function (c) {
                 var j = $([0]), i = -1, l = this.length;
                 while (
                     ++i < l
                     && (j.context = j[0] = this[i])
                     && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
                 );
                 return this;
+            }
         });
+    }
 })(jQuery);
 (function ($, undefined) {
     "use strict";
     /*global document, window, jQuery, console */
     if (window.Select2 !== undefined) {
         return;
+    }
-    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
     var AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
         lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
     KEY = {
         TAB: 9,
         ENTER: 13,
         ESC: 27,
         SPACE: 32,
         LEFT: 37,
         UP: 38,
         RIGHT: 39,
         DOWN: 40,
         SHIFT: 16,
         CTRL: 17,
         ALT: 18,
         PAGE_UP: 33,
         PAGE_DOWN: 34,
         HOME: 36,
         END: 35,
         BACKSPACE: 8,
         DELETE: 46,
         isArrow: function (k) {
             k = k.which ? k.which : k;
             switch (k) {
             case KEY.LEFT:
@@ @@ -111,86 +111,86 @@ the specific language governing permissi @@
         element.before(placeholder);
         placeholder.before(element);
         placeholder.remove();
+    }
     function stripDiacritics(str) {
         // Used 'uni range + named function' from http://jsperf.com/diacritics/18
         function match(a) {
             return DIACRITICS[a] || a;
+        }
         return str.replace(/[^\u0000-\u007E]/g, match);
+    }
     function indexOf(value, array) {
         var i = 0, l = array.length;
         for (; i < l; i = i + 1) {
             if (equal(value, array[i])) return i;
+        }
         return -1;
+    }
     function measureScrollbar () {
         var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
-        $template.appendTo('body');
+        $template.appendTo(document.body);
         var dim = {
             width: $template.width() - $template[0].clientWidth,
             height: $template.height() - $template[0].clientHeight
         };
         $template.remove();
         return dim;
+    }
     /**
      * Compares equality of a and b
      * @param a
      * @param b
      */
     function equal(a, b) {
         if (a === b) return true;
         if (a === undefined || b === undefined) return false;
         if (a === null || b === null) return false;
         // Check whether 'a' or 'b' is a string (primitive or object).
         // The concatenation of an empty string (+'') converts its argument to a string's primitive.
         if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
         if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
         return false;
+    }
     /**
-     * Splits the string into an array of values, trimming each value. An empty array is returned for nulls or empty
+     * Splits the string into an array of values, transforming each value. An empty array is returned for nulls or empty
      * strings
      * @param string
      * @param separator
      */
     function splitVal(string, separator) {
+    function splitVal(string, separator, transform) {
         var val, i, l;
         if (string === null || string.length < 1) return [];
         val = string.split(separator);
-        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
+        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = transform(val[i]);
         return val;
+    }
     function getSideBorderPadding(element) {
         return element.outerWidth(false) - element.width();
+    }
     function installKeyUpChangeEvent(element) {
         var key="keyup-change-value";
         element.on("keydown", function () {
             if ($.data(element, key) === undefined) {
                 $.data(element, key, element.val());
+            }
         });
         element.on("keyup", function () {
             var val= $.data(element, key);
             if (val !== undefined && element.val() !== val) {
                 $.removeData(element, key);
                 element.trigger("keyup-change");
+            }
         });
+    }
@@ @@ -290,49 +290,49 @@ the specific language governing permissi @@
         event.stopPropagation();
+    }
     function killEventImmediately(event) {
         event.preventDefault();
         event.stopImmediatePropagation();
+    }
     function measureTextWidth(e) {
         if (!sizer){
             var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
             sizer = $(document.createElement("div")).css({
                 position: "absolute",
                 left: "-10000px",
                 top: "-10000px",
                 display: "none",
                 fontSize: style.fontSize,
                 fontFamily: style.fontFamily,
                 fontStyle: style.fontStyle,
                 fontWeight: style.fontWeight,
                 letterSpacing: style.letterSpacing,
                 textTransform: style.textTransform,
                 whiteSpace: "nowrap"
             });
             sizer.attr("class","select2-sizer");
-            $("body").append(sizer);
+            $(document.body).append(sizer);
+        }
         sizer.text(e.val());
         return sizer.width();
+    }
     function syncCssClasses(dest, src, adapter) {
         var classes, replacements = [], adapted;
         classes = $.trim(dest.attr("class"));
         if (classes) {
             classes = '' + classes; // for IE which returns object
             $(classes.split(/\s+/)).each2(function() {
                 if (this.indexOf("select2-") === 0) {
                     replacements.push(this);
+                }
             });
+        }
         classes = $.trim(src.attr("class"));
         if (classes) {
             classes = '' + classes; // for IE which returns object
@@ @@ -423,48 +423,58 @@ the specific language governing permissi @@
                     params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
                 data = data ? data.call(self, query.term, query.page, query.context) : null;
                 url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
                 if (handler && typeof handler.abort === "function") { handler.abort(); }
                 if (options.params) {
                     if ($.isFunction(options.params)) {
                         $.extend(params, options.params.call(self));
                     } else {
                         $.extend(params, options.params);
+                    }
+                }
                 $.extend(params, {
                     url: url,
                     dataType: options.dataType,
                     data: data,
                     success: function (data) {
                         // 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);
+                    }
                 });
                 handler = transport.call(self, params);
             }, quietMillis);
         };
+    }
     /**
      * Produces a query function that works with a local array
+     *
      * @param options object containing configuration parameters. The options parameter can either be an array or an
      * object.
+     *
      * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
+     *
      * 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
      * the text.
      */
     function local(options) {
         var data = options, // data elements
             dataText,
@@ @@ -668,64 +678,67 @@ the specific language governing permissi @@
         bind: function (func) {
             var self = this;
             return function () {
                 func.apply(self, arguments);
             };
         },
         // abstract
         init: function (opts) {
             var results, search, resultsSelector = ".select2-results";
             // prepare options
             this.opts = opts = this.prepareOpts(opts);
             this.id=opts.id;
             // destroy if called on an existing component
             if (opts.element.data("select2") !== undefined &&
                 opts.element.data("select2") !== null) {
                 opts.element.data("select2").destroy();
+            }
             this.container = this.createContainer();
             this.liveRegion = $('.select2-hidden-accessible');
             if (this.liveRegion.length == 0) {
             this.liveRegion = $("<span>", {
                     role: "status",
                     "aria-live": "polite"
                 })
                 .addClass("select2-hidden-accessible")
                 .appendTo(document.body);
+            }
             this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
             this.containerEventName= this.containerId
                 .replace(/([.])/g, '_')
                 .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
             this.container.attr("id", this.containerId);
             this.container.attr("title", opts.element.attr("title"));
-            this.body = $("body");
+            this.body = $(document.body);
             syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
             this.container.attr("style", opts.element.attr("style"));
             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");
             // swap container for the element
             this.opts.element
                 .data("select2", this)
                 .attr("tabindex", "-1")
                 .before(this.container)
                 .on("click.select2", killEvent); // do not leak click events
             this.container.data("select2", this);
             this.dropdown = this.container.find(".select2-drop");
             syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
             this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element));
             this.dropdown.data("select2", this);
@@ @@ -780,113 +793,119 @@ the specific language governing permissi @@
                         results.scrollTop(results.get(0).scrollHeight - results.height());
                         killEvent(e);
+                    }
                 });
+            }
             installKeyUpChangeEvent(search);
             search.on("keyup-change input paste", this.bind(this.updateResults));
             search.on("focus", function () { search.addClass("select2-focused"); });
             search.on("blur", function () { search.removeClass("select2-focused");});
             this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
                 if ($(e.target).closest(".select2-result-selectable").length > 0) {
                     this.highlightUnderEvent(e);
                     this.selectHighlighted(e);
+                }
             }));
             // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
             // 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 touchstart touchend focusin", function (e) { e.stopPropagation(); });
-            this.nextSearchTerm = undefined;
+            this.lastSearchTerm = undefined;
             if ($.isFunction(this.opts.initSelection)) {
                 // initialize selection based on the current value of the source element
                 this.initSelection();
                 // if the user has provided a function that can set selection based on the value of the source element
                 // we monitor the change event on the element and trigger it, allowing for two way synchronization
                 this.monitorSource();
+            }
             if (opts.maximumInputLength !== null) {
                 this.search.attr("maxlength", opts.maximumInputLength);
+            }
             var disabled = opts.element.prop("disabled");
             if (disabled === undefined) disabled = false;
             this.enable(!disabled);
             var readonly = opts.element.prop("readonly");
             if (readonly === undefined) readonly = false;
             this.readonly(readonly);
             // Calculate size of scrollbar
             scrollBarDimensions = scrollBarDimensions || measureScrollbar();
             this.autofocus = opts.element.prop("autofocus");
             opts.element.prop("autofocus", false);
             if (this.autofocus) this.focus();
             this.search.attr("placeholder", opts.searchInputPlaceholder);
         },
         // 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) {
+            if (element.length && element[0].detachEvent && self._sync) {
                 element.each(function () {
                     this.detachEvent("onpropertychange", this._sync);
                     if (self._sync) {
                         this.detachEvent("onpropertychange", self._sync);
+                    }
                 });
+            }
             if (this.propertyObserver) {
                 this.propertyObserver.disconnect();
                 this.propertyObserver = null;
+            }
             this._sync = null;
             if (select2 !== undefined) {
                 select2.container.remove();
                 select2.liveRegion.remove();
                 select2.dropdown.remove();
                 element.removeData("select2")
                     .off(".select2");
                 if (!element.is("input[type='hidden']")) {
                 element
                     .removeClass("select2-offscreen")
                     .removeData("select2")
                     .off(".select2")
                         .show()
                     .prop("autofocus", this.autofocus || false);
                 if (this.elementTabIndex) {
                     element.attr({tabindex: this.elementTabIndex});
                 } else {
                     element.removeAttr("tabindex");
+                }
                 element.show();
                 } else {
                     element.css("display", "");
+                }
+            }
             cleanupJQueryElements.call(this,
                 "container",
                 "liveRegion",
                 "dropdown",
                 "results",
                 "search"
             );
         },
         // abstract
         optionToData: function(element) {
             if (element.is("option")) {
                 return {
                     id:element.prop("value"),
                     text:element.text(),
                     element: element.get(),
                     css: element.attr("class"),
                     disabled: element.prop("disabled"),
                     locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
                 };
             } else if (element.is("optgroup")) {
                 return {
@@ @@ -896,92 +915,240 @@ the specific language governing permissi @@
                     css: element.attr("class")
                 };
+            }
         },
         // abstract
         prepareOpts: function (opts) {
             var element, select, idKey, ajaxUrl, self = this;
             element = opts.element;
             if (element.get(0).tagName.toLowerCase() === "select") {
                 this.select = select = opts.element;
+            }
             if (select) {
                 // these options are not allowed when attached to a select because they are picked up off the element itself
                 $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
                     if (this in opts) {
                         throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
+                    }
                 });
+            }
             opts.debug = opts.debug || $.fn.select2.defaults.debug;
             // Warnings for options renamed/removed in Select2 4.0.0
             // Only when it's enabled through debug mode
             if (opts.debug && console && console.warn) {
                 // id was removed
                 if (opts.id != null) {
                     console.warn(
                         'Select2: The `id` option has been removed in Select2 4.0.0, ' +
                         'consider renaming your `id` property or mapping the property before your data makes it to Select2. ' +
                         'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
                     );
+                }
                 // text was removed
                 if (opts.text != null) {
                     console.warn(
                         'Select2: The `text` option has been removed in Select2 4.0.0, ' +
                         'consider renaming your `text` property or mapping the property before your data makes it to Select2. ' +
                         'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
                     );
+                }
                 // sortResults was renamed to results
                 if (opts.sortResults != null) {
                     console.warn(
                         'Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. '
                     );
+                }
                 // selectOnBlur was renamed to selectOnClose
                 if (opts.selectOnBlur != null) {
                     console.warn(
                         'Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0.'
                     );
+                }
                 // ajax.results was renamed to ajax.processResults
                 if (opts.ajax != null && opts.ajax.results != null) {
                     console.warn(
                         'Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0.'
                     );
+                }
                 // format* options were renamed to language.*
                 if (opts.formatNoResults != null) {
                     console.warn(
                         'Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0.'
                     );
+                }
                 if (opts.formatSearching != null) {
                     console.warn(
                         'Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0.'
                     );
+                }
                 if (opts.formatInputTooShort != null) {
                     console.warn(
                         'Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0.'
                     );
+                }
                 if (opts.formatInputTooLong != null) {
                     console.warn(
                         'Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0.'
                     );
+                }
                 if (opts.formatLoading != null) {
                     console.warn(
                         'Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0.'
                     );
+                }
                 if (opts.formatSelectionTooBig != null) {
                     console.warn(
                         'Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0.'
                     );
+                }
                 if (opts.element.data('select2Tags')) {
                     console.warn(
                         'Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.'
                     );
+                }
+            }
             // Aliasing options renamed in Select2 4.0.0
             // data-select2-tags -> data-tags
             if (opts.element.data('tags') != null) {
                 var elemTags = opts.element.data('tags');
                 // data-tags should actually be a boolean
                 if (!$.isArray(elemTags)) {
                     elemTags = [];
+                }
                 opts.element.data('select2Tags', elemTags);
+            }
             // sortResults -> sorter
             if (opts.sorter != null) {
                 opts.sortResults = opts.sorter;
+            }
             // selectOnBlur -> selectOnClose
             if (opts.selectOnClose != null) {
                 opts.selectOnBlur = opts.selectOnClose;
+            }
             // ajax.results -> ajax.processResults
             if (opts.ajax != null) {
                 if ($.isFunction(opts.ajax.processResults)) {
                     opts.ajax.results = opts.ajax.processResults;
+                }
+            }
             // Formatters/language options
             if (opts.language != null) {
                 var lang = opts.language;
                 // formatNoMatches -> language.noMatches
                 if ($.isFunction(lang.noMatches)) {
                     opts.formatNoMatches = lang.noMatches;
+                }
                 // formatSearching -> language.searching
                 if ($.isFunction(lang.searching)) {
                     opts.formatSearching = lang.searching;
+                }
                 // formatInputTooShort -> language.inputTooShort
                 if ($.isFunction(lang.inputTooShort)) {
                     opts.formatInputTooShort = lang.inputTooShort;
+                }
                 // formatInputTooLong -> language.inputTooLong
                 if ($.isFunction(lang.inputTooLong)) {
                     opts.formatInputTooLong = lang.inputTooLong;
+                }
                 // formatLoading -> language.loadingMore
                 if ($.isFunction(lang.loadingMore)) {
                     opts.formatLoading = lang.loadingMore;
+                }
                 // formatSelectionTooBig -> language.maximumSelected
                 if ($.isFunction(lang.maximumSelected)) {
                     opts.formatSelectionTooBig = lang.maximumSelected;
+                }
+            }
             opts = $.extend({}, {
                 populateResults: function(container, results, query) {
                     var populate, id=this.opts.id, liveRegion=this.liveRegion;
                     populate=function(results, container, depth) {
                         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=$("<li></li>");
                             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=$(document.createElement("div"));
                             label.addClass("select2-result-label");
                             label.attr("id", "select2-result-label-" + nextUid());
                             label.attr("role", "option");
                             formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
                             if (formatted!==undefined) {
                                 label.html(formatted);
                                 node.append(label);
+                            }
                             if (compound) {
                                 innerContainer=$("<ul></ul>");
                                 innerContainer.addClass("select2-result-sub");
                                 populate(result.children, innerContainer, depth+1);
                                 node.append(innerContainer);
+                            }
                             node.data("select2-data", result);
                             nodes.push(node[0]);
+                        }
                         // bulk append the created nodes
                         container.append(nodes);
                         liveRegion.text(opts.formatMatches(results.length));
                     };
                     populate(results, container, 0);
+                }
             }, $.fn.select2.defaults, opts);
             if (typeof(opts.id) !== "function") {
                 idKey = opts.id;
                 opts.id = function (e) { return e[idKey]; };
+            }
@@ @@ -1006,70 +1173,69 @@ the specific language governing permissi @@
+                            }
                         } else if (element.is("optgroup")) {
                             group=self.optionToData(element);
                             element.children().each2(function(i, elm) { process(elm, group.children); });
                             if (group.children.length>0) {
                                 collection.push(group);
+                            }
+                        }
                     };
                     children=element.children();
                     // ignore the placeholder option if there is one
                     if (this.getPlaceholder() !== undefined && children.length > 0) {
                         placeholderOption = this.getPlaceholderOption();
                         if (placeholderOption) {
                             children=children.not(placeholderOption);
+                        }
+                    }
                     children.each2(function(i, elm) { process(elm, data.results); });
                     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)) {
                     if ("ajax" in opts) {
                         ajaxUrl = opts.element.data("ajax-url");
                         if (ajaxUrl && ajaxUrl.length > 0) {
                             opts.ajax.url = ajaxUrl;
+                        }
                         opts.query = ajax.call(opts.element, opts.ajax);
                     } else if ("data" in opts) {
                         opts.query = local(opts.data);
                     } else if ("tags" in opts) {
                         opts.query = tags(opts.tags);
                         if (opts.createSearchChoice === undefined) {
                             opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
+                        }
                         if (opts.initSelection === undefined) {
                             opts.initSelection = function (element, callback) {
                                 var data = [];
                                 $(splitVal(element.val(), opts.separator)).each(function () {
+                                $(splitVal(element.val(), opts.separator, opts.transformVal)).each(function () {
                                     var obj = { id: this, text: this },
                                         tags = opts.tags;
                                     if ($.isFunction(tags)) tags=tags();
                                     $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
                                     data.push(obj);
                                 });
                                 callback(data);
                             };
+                        }
+                    }
+                }
+            }
             if (typeof(opts.query) !== "function") {
                 throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
             if (opts.createSearchChoicePosition === 'top') {
                 opts.createSearchChoicePosition = function(list, item) { list.unshift(item); };
+            }
             else if (opts.createSearchChoicePosition === 'bottom') {
                 opts.createSearchChoicePosition = function(list, item) { list.push(item); };
+            }
             else if (typeof(opts.createSearchChoicePosition) !== "function")  {
@@ @@ -1082,53 +1248,57 @@ the specific language governing permissi @@
         /**
          * Monitor the original element for changes and update select2 accordingly
          */
         // abstract
         monitorSource: function () {
             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) {
                     this.initSelection();
+                }
             }));
             this._sync = this.bind(function () {
                 // sync enabled state
                 var disabled = el.prop("disabled");
                 if (disabled === undefined) disabled = false;
                 this.enable(!disabled);
                 var readonly = el.prop("readonly");
                 if (readonly === undefined) readonly = false;
                 this.readonly(readonly);
                 if (this.container) {
                 syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
                 this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element));
+                }
                 if (this.dropdown) {
                 syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
                 this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element));
+                }
             });
             // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener)
             if (el.length && el[0].attachEvent) {
                 el.each(function() {
                     this.attachEvent("onpropertychange", self._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(function (mutations) {
                     $.each(mutations, self._sync);
                 });
                 this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
+            }
         },
         // abstract
         triggerSelect: function(data) {
             var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data });
@@ @@ -1191,142 +1361,147 @@ the specific language governing permissi @@
         // abstract
         disable: function() {
             this.enable(false);
         },
         // abstract
         readonly: function(enabled) {
             if (enabled === undefined) enabled = false;
             if (this._readonly === enabled) return;
             this._readonly = enabled;
             this.opts.element.prop("readonly", enabled);
             this.enableInterface();
         },
         // abstract
         opened: function () {
             return (this.container) ? this.container.hasClass("select2-dropdown-open") : false;
         },
         // abstract
         positionDropdown: function() {
             var $dropdown = this.dropdown,
                 offset = this.container.offset(),
                 height = this.container.outerHeight(false),
                 width = this.container.outerWidth(false),
                 container = this.container,
                 offset = container.offset(),
                 height = container.outerHeight(false),
                 width = container.outerWidth(false),
                 dropHeight = $dropdown.outerHeight(false),
                 $window = $(window),
                 windowWidth = $window.width(),
                 windowHeight = $window.height(),
                 viewPortRight = $window.scrollLeft() + windowWidth,
                 viewportBottom = $window.scrollTop() + windowHeight,
                 dropTop = offset.top + height,
                 dropLeft = offset.left,
                 enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
                 enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
                 dropWidth = $dropdown.outerWidth(false),
                 enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight,
                 enoughRoomOnRight = function() {
                     return dropLeft + dropWidth <= viewPortRight;
                 },
                 enoughRoomOnLeft = function() {
                     return offset.left + viewPortRight + container.outerWidth(false)  > dropWidth;
                 },
                 aboveNow = $dropdown.hasClass("select2-drop-above"),
                 bodyOffset,
                 above,
                 changeDirection,
                 css,
                 resultsListNode;
             // always prefer the current above/below alignment, unless there is not enough room
             if (aboveNow) {
                 above = true;
                 if (!enoughRoomAbove && enoughRoomBelow) {
                     changeDirection = true;
                     above = false;
+                }
             } else {
                 above = false;
                 if (!enoughRoomBelow && enoughRoomAbove) {
                     changeDirection = true;
                     above = true;
+                }
+            }
             //if we are changing direction we need to get positions when dropdown is hidden;
             if (changeDirection) {
                 $dropdown.hide();
                 offset = this.container.offset();
                 height = this.container.outerHeight(false);
                 width = this.container.outerWidth(false);
                 dropHeight = $dropdown.outerHeight(false);
                 viewPortRight = $window.scrollLeft() + windowWidth;
                 viewportBottom = $window.scrollTop() + windowHeight;
                 dropTop = offset.top + height;
                 dropLeft = offset.left;
                 dropWidth = $dropdown.outerWidth(false);
                 enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
                 $dropdown.show();
                 // fix so the cursor does not move to the left within the search-textbox in IE
                 this.focusSearch();
+            }
             if (this.opts.dropdownAutoWidth) {
                 resultsListNode = $('.select2-results', $dropdown)[0];
                 $dropdown.addClass('select2-drop-auto-width');
                 $dropdown.css('width', '');
                 // 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 {
                 this.container.removeClass('select2-drop-auto-width');
+            }
             //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);
             // fix positioning when body has an offset and is not position: static
             if (this.body.css('position') !== 'static') {
                 bodyOffset = this.body.offset();
                 dropTop -= bodyOffset.top;
                 dropLeft -= bodyOffset.left;
+            }
             if (!enoughRoomOnRight) {
+            if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
                 dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
+            }
             css =  {
                 left: dropLeft,
                 width: width
             };
             if (above) {
                 this.container.addClass("select2-drop-above");
                 $dropdown.addClass("select2-drop-above");
                 dropHeight = $dropdown.outerHeight(false);
                 css.top = offset.top - dropHeight;
                 css.bottom = 'auto';
                 this.container.addClass("select2-drop-above");
                 $dropdown.addClass("select2-drop-above");
+            }
             else {
                 css.top = dropTop;
                 css.bottom = 'auto';
                 this.container.removeClass("select2-drop-above");
                 $dropdown.removeClass("select2-drop-above");
+            }
             css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element));
             $dropdown.css(css);
         },
         // abstract
         shouldOpen: function() {
             var event;
             if (this.opened()) return false;
             if (this._enabled === false || this._readonly === true) return false;
             event = $.Event("select2-opening");
             this.opts.element.trigger(event);
             return !event.isDefaultPrevented();
         },
@@ @@ -1360,49 +1535,49 @@ the specific language governing permissi @@
             return true;
         },
         /**
          * Performs the opening of the dropdown
          */
         // abstract
         opening: function() {
             var cid = this.containerEventName,
                 scroll = "scroll." + cid,
                 resize = "resize."+cid,
                 orient = "orientationchange."+cid,
                 mask;
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
             this.clearDropdownAlignmentPreference();
             if(this.dropdown[0] !== this.body.children().last()[0]) {
                 this.dropdown.detach().appendTo(this.body);
+            }
             // create the dropdown mask if doesn't already exist
             mask = $("#select2-drop-mask");
             if (mask.length == 0) {
+            if (mask.length === 0) {
                 mask = $(document.createElement("div"));
                 mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
                 mask.hide();
                 mask.appendTo(this.body);
                 mask.on("mousedown touchstart click", function (e) {
                     // Prevent IE from generating a click event on the body
                     reinsertElement(mask);
                     var dropdown = $("#select2-drop"), self;
                     if (dropdown.length > 0) {
                         self=dropdown.data("select2");
                         if (self.opts.selectOnBlur) {
                             self.selectHighlighted({noFocus: true});
+                        }
                         self.close();
                         e.preventDefault();
                         e.stopPropagation();
+                    }
                 });
+            }
             // ensure the mask is always right before the dropdown
             if (this.dropdown.prev()[0] !== mask[0]) {
                 this.dropdown.before(mask);
@@ @@ -1437,106 +1612,130 @@ the specific language governing permissi @@
         close: function () {
             if (!this.opened()) return;
             var cid = this.containerEventName,
                 scroll = "scroll." + cid,
                 resize = "resize."+cid,
                 orient = "orientationchange."+cid;
             // unbind event listeners
             this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
             this.clearDropdownAlignmentPreference();
             $("#select2-drop-mask").hide();
             this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
             this.dropdown.hide();
             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");
             // Remove the aria active descendant for highlighted element
             this.search.removeAttr("aria-activedescendant");
             this.opts.element.trigger($.Event("select2-close"));
         },
         /**
          * Opens control, sets input value, and updates results.
          */
         // abstract
         externalSearch: function (term) {
             this.open();
             this.search.val(term);
             this.updateResults(false);
         },
         // abstract
         clearSearch: function () {
         },
         /**
          * @return {Boolean} Whether or not search value was changed.
          * @private
          */
         prefillNextSearchTerm: function () {
             // initializes search's value with nextSearchTerm (if defined by user)
             // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
             if(this.search.val() !== "") {
                 return false;
+            }
             var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm);
             if(nextSearchTerm !== undefined){
                 this.search.val(nextSearchTerm);
                 this.search.select();
                 return true;
+            }
             return false;
         },
         //abstract
         getMaximumSelectionSize: function() {
             return evaluate(this.opts.maximumSelectionSize, this.opts.element);
         },
         // abstract
         ensureHighlightVisible: function () {
             var results = this.results, children, index, child, hb, rb, y, more, topOffset;
             index = this.highlight();
             if (index < 0) return;
             if (index == 0) {
                 // if the first element is highlighted scroll all the way to the top,
                 // that way any unselectable headers above it will also be scrolled
                 // into view
                 results.scrollTop(0);
                 return;
+            }
             children = this.findHighlightableChoices().find('.select2-result-label');
             child = $(children[index]);
             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) {
                 more = results.find("li.select2-more-results");
                 if (more.length > 0) {
                     hb = more.offset().top + more.outerHeight(true);
+                }
+            }
-            rb = results.offset().top + results.outerHeight(true);
+            rb = results.offset().top + results.outerHeight(false);
             if (hb > rb) {
                 results.scrollTop(results.scrollTop() + (hb - rb));
+            }
             y = topOffset - results.offset().top;
             // make sure the top of the element is visible
             if (y < 0 && child.css('display') != 'none' ) {
                 results.scrollTop(results.scrollTop() + y); // y is negative
+            }
         },
         // abstract
         findHighlightableChoices: function() {
             return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
         },
         // abstract
         moveHighlight: function (delta) {
             var choices = this.findHighlightableChoices(),
                 index = this.highlight();
             while (index > -1 && index < choices.length) {
                 index += delta;
                 var choice = $(choices[index]);
@@ @@ -1617,49 +1816,49 @@ the specific language governing permissi @@
                 term=this.search.val(),
                 context=this.context;
             if (more.length === 0) return;
             below = more.offset().top - results.offset().top - results.height();
             if (below <= this.opts.loadMorePadding) {
                 more.addClass("select2-active");
                 this.opts.query({
                         element: this.opts.element,
                         term: term,
                         page: page,
                         context: context,
                         matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
                     // ignore a response if the select2 has been closed before it was received
                     if (!self.opened()) return;
                     self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
                     self.postprocessResults(data, false, false);
                     if (data.more===true) {
-                        more.detach().appendTo(results).text(evaluate(self.opts.formatLoadMore, self.opts.element, page+1));
+                        more.detach().appendTo(results).html(self.opts.escapeMarkup(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)));
                         window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
                     } else {
                         more.remove();
+                    }
                     self.positionDropdown();
                     self.resultsPage = page;
                     self.context = data.context;
                     this.opts.element.trigger({ type: "select2-loaded", items: data });
                 })});
+            }
         },
         /**
          * Default tokenizer function which does nothing
          */
         tokenize: function() {
         },
         /**
          * @param initial whether or not this is the call to this method right after the dropdown has been opened
          */
         // abstract
         updateResults: function (initial) {
@@ @@ -1670,49 +1869,49 @@ the specific language governing permissi @@
                 self = this,
                 input,
                 term = search.val(),
                 lastTerm = $.data(this.container, "select2-last-term"),
                 // sequence number used to drop out-of-order responses
                 queryNumber;
             // prevent duplicate queries against the same term
             if (initial !== true && lastTerm && equal(term, lastTerm)) return;
             $.data(this.container, "select2-last-term", term);
             // if the search is currently hidden we do not alter the results
             if (initial !== true && (this.showSearchInput === false || !this.opened())) {
                 return;
+            }
             function postRender() {
                 search.removeClass("select2-active");
                 self.positionDropdown();
                 if (results.find('.select2-no-results,.select2-selection-limit,.select2-searching').length) {
                     self.liveRegion.text(results.text());
+                }
                 else {
                     self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable').length));
+                    self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
+                }
+            }
             function render(html) {
                 results.html(html);
                 postRender();
+            }
             queryNumber = ++this.queryCount;
             var maxSelSize = this.getMaximumSelectionSize();
             if (maxSelSize >=1) {
                 data = this.data();
                 if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
                     render("<li class='select2-selection-limit'>" + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "</li>");
                     return;
+                }
+            }
             if (search.val().length < opts.minimumInputLength) {
                 if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
                     render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "</li>");
                 } else {
                     render("");
@@ @@ -1745,65 +1944,74 @@ the specific language governing permissi @@
+            }
             this.resultsPage = 1;
             opts.query({
                 element: opts.element,
                     term: search.val(),
                     page: this.resultsPage,
                     context: null,
                     matcher: opts.matcher,
                     callback: this.bind(function (data) {
                 var def; // default choice
                 // ignore old responses
                 if (queryNumber != this.queryCount) {
                   return;
+                }
                 // ignore a response if the select2 has been closed before it was received
                 if (!this.opened()) {
                     this.search.removeClass("select2-active");
                     return;
+                }
                 // handle ajax error
                 if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
                     render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
                     return;
+                }
                 // save context, if any
                 this.context = (data.context===undefined) ? null : data.context;
                 // create a default choice and prepend it to the list
                 if (this.opts.createSearchChoice && search.val() !== "") {
                     def = this.opts.createSearchChoice.call(self, search.val(), data.results);
                     if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
                         if ($(data.results).filter(
                             function () {
                                 return equal(self.id(this), self.id(def));
                             }).length === 0) {
                             this.opts.createSearchChoicePosition(data.results, def);
+                        }
+                    }
+                }
                 if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
                     render("<li class='select2-no-results'>" + evaluate(opts.formatNoMatches, opts.element, search.val()) + "</li>");
                     if(this.showSearch){
                         this.showSearch(search.val());
+                    }
                     return;
+                }
                 results.empty();
                 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("<li class='select2-more-results'>" + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "</li>");
                     window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
                 this.postprocessResults(data, initial);
                 postRender();
                 this.opts.element.trigger({ type: "select2-loaded", items: data });
             })});
         },
         // abstract
         cancel: function () {
             this.close();
         },
@@ @@ -1866,49 +2074,49 @@ the specific language governing permissi @@
                     //No explicit placeholder option specified, use the first if it's blank
                     return firstOption;
+                }
+            }
         },
         /**
          * Get the desired width for the container element.  This is
          * derived first from option `width` passed to select2, then
          * the inline 'style' on the original element, and finally
          * falls back to the jQuery calculated element width.
          */
         // abstract
         initContainerWidth: function () {
             function resolveContainerWidth() {
                 var style, attrs, matches, i, l, attr;
                 if (this.opts.width === "off") {
                     return null;
                 } else if (this.opts.width === "element"){
                     return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
                 } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
                     // check if there is inline style on the element that contains width
                     style = this.opts.element.attr('style');
-                    if (style !== undefined) {
+                    if (typeof(style) === "string") {
                         attrs = style.split(';');
                         for (i = 0, l = attrs.length; i < l; i = i + 1) {
                             attr = attrs[i].replace(/\s/g, '');
                             matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
                             if (matches !== null && matches.length >= 1)
                                 return matches[1];
+                        }
+                    }
                     if (this.opts.width === "resolve") {
                         // next check if css('width') can resolve a width that is percent based, this is sometimes possible
                         // when attached to input type=hidden or elements hidden via css
                         style = this.opts.element.css('width');
                         if (style.indexOf("%") > 0) return style;
                         // finally, fallback on the calculated width of the element
                         return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
+                    }
                     return null;
                 } else if ($.isFunction(this.opts.width)) {
                     return this.opts.width();
                 } else {
                     return this.opts.width;
@@ @@ -1965,56 +2173,49 @@ the specific language governing permissi @@
             this.parent.opening.apply(this, arguments);
             if (this.showSearchInput !== false) {
                 // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
                 // all other browsers handle this just fine
                 this.search.val(this.focusser.val());
+            }
             if (this.opts.shouldFocusInput(this)) {
                 this.search.focus();
                 // move the cursor to the end after focussing, otherwise it will be at the beginning and
                 // new text will appear *before* focusser.val()
                 el = this.search.get(0);
                 if (el.createTextRange) {
                     range = el.createTextRange();
                     range.collapse(false);
                     range.select();
                 } else if (el.setSelectionRange) {
                     len = this.search.val().length;
                     el.setSelectionRange(len, len);
+                }
+            }
             // initializes search's value with nextSearchTerm (if defined by user)
             // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
             if(this.search.val() === "") {
                 if(this.nextSearchTerm != undefined){
                     this.search.val(this.nextSearchTerm);
                     this.search.select();
+                }
+            }
             this.prefillNextSearchTerm();
             this.focusser.prop("disabled", true).val("");
             this.updateResults(true);
             this.opts.element.trigger($.Event("select2-open"));
         },
         // single
         close: function () {
             if (!this.opened()) return;
             this.parent.close.apply(this, arguments);
             this.focusser.prop("disabled", false);
             if (this.opts.shouldFocusInput(this)) {
                 this.focusser.focus();
+            }
         },
         // single
         focus: function () {
             if (this.opened()) {
                 this.close();
             } else {
                 this.focusser.prop("disabled", false);
@@ @@ -2059,247 +2260,257 @@ the specific language governing permissi @@
                 dropdown = this.dropdown,
                 idSuffix = nextUid(),
                 elementLabel;
             if (this.opts.minimumResultsForSearch < 0) {
                 this.showSearch(false);
             } else {
                 this.showSearch(true);
+            }
             this.selection = selection = container.find(".select2-choice");
             this.focusser = container.find(".select2-focusser");
             // add aria associations
             selection.find(".select2-chosen").attr("id", "select2-chosen-"+idSuffix);
             this.focusser.attr("aria-labelledby", "select2-chosen-"+idSuffix);
             this.results.attr("id", "select2-results-"+idSuffix);
             this.search.attr("aria-owns", "select2-results-"+idSuffix);
             // rewrite labels from original element to focusser
             this.focusser.attr("id", "s2id_autogen"+idSuffix);
             elementLabel = $("label[for='" + this.opts.element.attr("id") + "']");
             this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
             this.focusser.prev()
                 .text(elementLabel.text())
                 .attr('for', this.focusser.attr('id'));
             // Ensure the original element retains an accessible name
             var originalTitle = this.opts.element.attr("title");
             this.opts.element.attr("title", (originalTitle || elementLabel.text()));
             this.focusser.attr("tabindex", this.elementTabIndex);
             // write label for search field using the label from the focusser element
             this.search.attr("id", this.focusser.attr('id') + '_search');
             this.search.prev()
                 .text($("label[for='" + this.focusser.attr('id') + "']").text())
                 .attr('for', this.search.attr('id'));
             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);
                     return;
+                }
                 switch (e.which) {
                     case KEY.UP:
                     case KEY.DOWN:
                         this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
                         killEvent(e);
                         return;
                     case KEY.ENTER:
                         this.selectHighlighted();
                         killEvent(e);
                         return;
                     case KEY.TAB:
                         this.selectHighlighted({noFocus: true});
                         return;
                     case KEY.ESC:
                         this.cancel(e);
                         killEvent(e);
                         return;
+                }
             }));
             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)) {
                     window.setTimeout(this.bind(function() {
                         if (this.opened()) {
+                        if (this.opened() && this.results && this.results.length > 1) {
                             this.search.focus();
+                        }
                     }), 0);
+                }
             }));
             this.focusser.on("keydown", this.bind(function (e) {
                 if (!this.isInterfaceEnabled()) return;
                 if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
                     return;
+                }
                 if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
                     killEvent(e);
                     return;
+                }
                 if (e.which == KEY.DOWN || e.which == KEY.UP
                     || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
                     if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
                     this.open();
                     killEvent(e);
                     return;
+                }
                 if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
                     if (this.opts.allowClear) {
                         this.clear();
+                    }
                     killEvent(e);
                     return;
+                }
             }));
             installKeyUpChangeEvent(this.focusser);
             this.focusser.on("keyup-change input", this.bind(function(e) {
                 if (this.opts.minimumResultsForSearch >= 0) {
                     e.stopPropagation();
                     if (this.opened()) return;
                     this.open();
+                }
             }));
             selection.on("mousedown touchstart", "abbr", this.bind(function (e) {
                 if (!this.isInterfaceEnabled()) return;
                 if (!this.isInterfaceEnabled()) {
                     return;
+                }
                 this.clear();
                 killEventImmediately(e);
                 this.close();
                 if (this.selection) {
                 this.selection.focus();
+                }
             }));
             selection.on("mousedown touchstart", this.bind(function (e) {
                 // Prevent IE from generating a click event on the body
                 reinsertElement(selection);
                 if (!this.container.hasClass("select2-container-active")) {
                     this.opts.element.trigger($.Event("select2-focus"));
+                }
                 if (this.opened()) {
                     this.close();
                 } else if (this.isInterfaceEnabled()) {
                     this.open();
+                }
                 killEvent(e);
             }));
             dropdown.on("mousedown touchstart", this.bind(function() {
                 if (this.opts.shouldFocusInput(this)) {
                     this.search.focus();
+                }
             }));
             selection.on("focus", this.bind(function(e) {
                 killEvent(e);
             }));
             this.focusser.on("focus", this.bind(function(){
                 if (!this.container.hasClass("select2-container-active")) {
                     this.opts.element.trigger($.Event("select2-focus"));
+                }
                 this.container.addClass("select2-container-active");
             })).on("blur", this.bind(function() {
                 if (!this.opened()) {
                     this.container.removeClass("select2-container-active");
                     this.opts.element.trigger($.Event("select2-blur"));
+                }
             }));
             this.search.on("focus", this.bind(function(){
                 if (!this.container.hasClass("select2-container-active")) {
                     this.opts.element.trigger($.Event("select2-focus"));
+                }
                 this.container.addClass("select2-container-active");
             }));
             this.initContainerWidth();
-            this.opts.element.addClass("select2-offscreen");
+            this.opts.element.hide();
             this.setPlaceholder();
         },
         // single
         clear: function(triggerChange) {
             var data=this.selection.data("select2-data");
             if (data) { // guard against queued quick consecutive clicks
                 var evt = $.Event("select2-clearing");
                 this.opts.element.trigger(evt);
                 if (evt.isDefaultPrevented()) {
                     return;
+                }
                 var placeholderOption = this.getPlaceholderOption();
                 this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
                 this.selection.find(".select2-chosen").empty();
                 this.selection.removeData("select2-data");
                 this.setPlaceholder();
                 if (triggerChange !== false){
                     this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
                     this.triggerChange({removed:data});
+                }
+            }
         },
         /**
          * Sets selection based on source element's value
          */
         // single
         initSelection: function () {
             var selected;
             if (this.isPlaceholderOptionSelected()) {
                 this.updateSelection(null);
                 this.close();
                 this.setPlaceholder();
             } else {
                 var self = this;
                 this.opts.initSelection.call(null, this.opts.element, function(selected){
                     if (selected !== undefined && selected !== null) {
                         self.updateSelection(selected);
                         self.close();
                         self.setPlaceholder();
-                        self.nextSearchTerm = self.opts.nextSearchTerm(selected, self.search.val());
+                        self.lastSearchTerm = self.search.val();
+                    }
                 });
+            }
         },
         isPlaceholderOptionSelected: function() {
             var placeholderOption;
             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)
                 || (this.opts.element.val() === null);
         },
         // single
         prepareOpts: function () {
             var opts = this.parent.prepareOpts.apply(this, arguments),
                 self=this;
             if (opts.element.get(0).tagName.toLowerCase() === "select") {
                 // install the selection initializer
                 opts.initSelection = function (element, callback) {
                     var selected = element.find("option").filter(function() { return this.selected && !this.disabled });
                     // a single select box always has a value, no need to null check 'selected'
@@ @@ -2394,49 +2605,49 @@ the specific language governing permissi @@
         showSearch: function(showSearchInput) {
             if (this.showSearchInput === showSearchInput) return;
             this.showSearchInput = showSearchInput;
             this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
             this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
             //add "select2-with-searchbox" to the container if search box is shown
             $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
         },
         // single
         onSelect: function (data, options) {
             if (!this.triggerSelect(data)) { return; }
             var old = this.opts.element.val(),
                 oldData = this.data();
             this.opts.element.val(this.id(data));
             this.updateSelection(data);
             this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
-            this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val());
+            this.lastSearchTerm = this.search.val();
             this.close();
             if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) {
                 this.focusser.focus();
+            }
             if (!equal(old, this.id(data))) {
                 this.triggerChange({ added: data, removed: oldData });
+            }
         },
         // single
         updateSelection: function (data) {
             var container=this.selection.find(".select2-chosen"), formatted, cssClass;
             this.selection.data("select2-data", data);
             container.empty();
             if (data !== null) {
                 formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
+            }
             if (formatted !== undefined) {
                 container.append(formatted);
@@ @@ -2448,158 +2659,178 @@ the specific language governing permissi @@
             this.selection.removeClass("select2-default");
             if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
                 this.container.addClass("select2-allowclear");
+            }
         },
         // single
         val: function () {
             var val,
                 triggerChange = false,
                 data = null,
                 self = this,
                 oldData = this.data();
             if (arguments.length === 0) {
                 return this.opts.element.val();
+            }
             val = arguments[0];
             if (arguments.length > 1) {
                 triggerChange = arguments[1];
                 if (this.opts.debug && console && console.warn) {
                     console.warn(
                         'Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. ' +
                         'The `change` event will always be triggered in 4.0.0.'
                     );
+                }
+            }
             if (this.select) {
                 if (this.opts.debug && console && console.warn) {
                     console.warn(
                         'Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. ' +
                         'You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'
                     );
+                }
                 this.select
                     .val(val)
                     .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
                         data = self.optionToData(elm);
                         return false;
                     });
                 this.updateSelection(data);
                 this.setPlaceholder();
                 if (triggerChange) {
                     this.triggerChange({added: data, removed:oldData});
+                }
             } else {
                 // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
                 if (!val && val !== 0) {
                     this.clear(triggerChange);
                     return;
+                }
                 if (this.opts.initSelection === undefined) {
                     throw new Error("cannot call val() if initSelection() is not defined");
+                }
                 this.opts.element.val(val);
                 this.opts.initSelection(this.opts.element, function(data){
                     self.opts.element.val(!data ? "" : self.id(data));
                     self.updateSelection(data);
                     self.setPlaceholder();
                     if (triggerChange) {
                         self.triggerChange({added: data, removed:oldData});
+                    }
                 });
+            }
         },
         // single
         clearSearch: function () {
             this.search.val("");
             this.focusser.val("");
         },
         // single
         data: function(value) {
             var data,
                 triggerChange = false;
             if (arguments.length === 0) {
                 data = this.selection.data("select2-data");
                 if (data == undefined) data = null;
                 return data;
             } else {
                 if (this.opts.debug && console && console.warn) {
                     console.warn(
                         'Select2: The `select2("data")` method can no longer set selected values in 4.0.0, ' +
                         'consider using the `.val()` method instead.'
                     );
+                }
                 if (arguments.length > 1) {
                     triggerChange = arguments[1];
+                }
                 if (!value) {
                     this.clear(triggerChange);
                 } else {
                     data = this.data();
                     this.opts.element.val(!value ? "" : this.id(value));
                     this.updateSelection(value);
                     if (triggerChange) {
                         this.triggerChange({added: value, removed:data});
+                    }
+                }
+            }
+        }
     });
     MultiSelect2 = clazz(AbstractSelect2, {
         // multi
         createContainer: function () {
             var container = $(document.createElement("div")).attr({
                 "class": "select2-container select2-container-multi"
             }).html([
                 "<ul class='select2-choices'>",
                 "  <li class='select2-search-field'>",
                 "    <label for='' class='select2-offscreen'></label>",
                 "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
                 "  </li>",
                 "</ul>",
                 "<div class='select2-drop select2-drop-multi select2-display-none'>",
                 "   <ul class='select2-results'>",
                 "   </ul>",
                 "</div>"].join(""));
             return container;
         },
         // multi
         prepareOpts: function () {
             var opts = this.parent.prepareOpts.apply(this, arguments),
                 self=this;
             // TODO validate placeholder is a string if specified
             if (opts.element.get(0).tagName.toLowerCase() === "select") {
                 // install the selection initializer
                 opts.initSelection = function (element, callback) {
                     var data = [];
                     element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) {
                         data.push(self.optionToData(elm));
                     });
                     callback(data);
                 };
             } else if ("data" in opts) {
                 // install default initSelection when applied to hidden input and data is local
                 opts.initSelection = opts.initSelection || function (element, callback) {
                     var ids = splitVal(element.val(), opts.separator);
+                    var ids = splitVal(element.val(), opts.separator, opts.transformVal);
                     //search in data by array of ids, storing matching items in a list
                     var matches = [];
                     opts.query({
                         matcher: function(term, text, el){
                             var is_match = $.grep(ids, function(id) {
                                 return equal(id, opts.id(el));
                             }).length;
                             if (is_match) {
                                 matches.push(el);
+                            }
                             return is_match;
                         },
                         callback: !$.isFunction(callback) ? $.noop : function() {
                             // reorder matches based on the order they appear in the ids array because right now
                             // they are in the order in which they appear in data array
                             var ordered = [];
                             for (var i = 0; i < ids.length; i++) {
                                 var id = ids[i];
                                 for (var j = 0; j < matches.length; j++) {
                                     var match = matches[j];
                                     if (equal(id, opts.id(match))) {
                                         ordered.push(match);
                                         matches.splice(j, 1);
                                         break;
@@ @@ -2634,60 +2865,60 @@ the specific language governing permissi @@
+            }
         },
         // multi
         destroy: function() {
             $("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
         initContainer: function () {
             var selector = ".select2-choices", selection;
             this.searchContainer = this.container.find(".select2-search-field");
             this.selection = selection = this.container.find(selector);
             var _this = this;
             this.selection.on("click", ".select2-search-choice:not(.select2-locked)", function (e) {
                 //killEvent(e);
             this.selection.on("click", ".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)", function (e) {
                 _this.search[0].focus();
                 _this.selectChoice($(this));
             });
             // rewrite labels from original element to focusser
             this.search.attr("id", "s2id_autogen"+nextUid());
             this.search.prev()
                 .text($("label[for='" + this.opts.element.attr("id") + "']").text())
                 .attr('for', this.search.attr('id'));
             this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
             this.search.on("input paste", this.bind(function() {
                 if (this.search.attr('placeholder') && this.search.val().length == 0) return;
                 if (!this.isInterfaceEnabled()) return;
                 if (!this.opened()) {
                     this.open();
+                }
             }));
             this.search.attr("tabindex", this.elementTabIndex);
             this.keydowns = 0;
             this.search.on("keydown", this.bind(function (e) {
                 if (!this.isInterfaceEnabled()) return;
                 ++this.keydowns;
                 var selected = selection.find(".select2-search-choice-focus");
                 var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
                 var next = selected.next(".select2-search-choice:not(.select2-locked)");
                 var pos = getCursorInfo(this.search);
                 if (selected.length &&
                     (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
                     var selectedChoice = selected;
@@ @@ -2797,49 +3028,49 @@ the specific language governing permissi @@
                     // clicked inside a select2 search choice, do not open
                     return;
+                }
                 this.selectChoice(null);
                 this.clearPlaceholder();
                 if (!this.container.hasClass("select2-container-active")) {
                     this.opts.element.trigger($.Event("select2-focus"));
+                }
                 this.open();
                 this.focusSearch();
                 e.preventDefault();
             }));
             this.container.on("focus", selector, this.bind(function () {
                 if (!this.isInterfaceEnabled()) return;
                 if (!this.container.hasClass("select2-container-active")) {
                     this.opts.element.trigger($.Event("select2-focus"));
+                }
                 this.container.addClass("select2-container-active");
                 this.dropdown.addClass("select2-drop-active");
                 this.clearPlaceholder();
             }));
             this.initContainerWidth();
-            this.opts.element.addClass("select2-offscreen");
+            this.opts.element.hide();
             // set the placeholder if necessary
             this.clearSearch();
         },
         // multi
         enableInterface: function() {
             if (this.parent.enableInterface.apply(this, arguments)) {
                 this.search.prop("disabled", !this.isInterfaceEnabled());
+            }
         },
         // multi
         initSelection: function () {
             var data;
             if (this.opts.element.val() === "" && this.opts.element.text() === "") {
                 this.updateSelection([]);
                 this.close();
                 // set the placeholder if necessary
                 this.clearSearch();
+            }
             if (this.select || this.opts.element.val() !== "") {
                 var self = this;
                 this.opts.initSelection.call(null, this.opts.element, function(data){
@@ @@ -2863,221 +3094,215 @@ the specific language governing permissi @@
                 // stretch the search box to full width of the container so as much of the placeholder is visible as possible
                 // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
                 this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
             } else {
                 this.search.val("").width(10);
+            }
         },
         // multi
         clearPlaceholder: function () {
             if (this.search.hasClass("select2-default")) {
                 this.search.val("").removeClass("select2-default");
+            }
         },
         // multi
         opening: function () {
             this.clearPlaceholder(); // should be done before super so placeholder is not used to search
             this.resizeSearch();
             this.parent.opening.apply(this, arguments);
             this.focusSearch();
             // initializes search's value with nextSearchTerm (if defined by user)
             // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
             if(this.search.val() === "") {
                 if(this.nextSearchTerm != undefined){
                     this.search.val(this.nextSearchTerm);
                     this.search.select();
+                }
+            }
             this.prefillNextSearchTerm();
             this.updateResults(true);
             if (this.opts.shouldFocusInput(this)) {
                 this.search.focus();
+            }
             this.opts.element.trigger($.Event("select2-open"));
         },
         // multi
         close: function () {
             if (!this.opened()) return;
             this.parent.close.apply(this, arguments);
         },
         // multi
         focus: function () {
             this.close();
             this.search.focus();
         },
         // multi
         isFocused: function () {
             return this.search.hasClass("select2-focused");
         },
         // multi
         updateSelection: function (data) {
-            var ids = [], filtered = [], self = this;
+            var ids = {}, filtered = [], self = this;
             // filter out duplicates
             $(data).each(function () {
                 if (indexOf(self.id(this), ids) < 0) {
                     ids.push(self.id(this));
                 if (!(self.id(this) in ids)) {
                     ids[self.id(this)] = 0;
                     filtered.push(this);
+                }
             });
             data = filtered;
             this.selection.find(".select2-search-choice").remove();
             $(data).each(function () {
                 self.addSelectedChoice(this);
             });
             this.addSelectedChoice(filtered);
             self.postprocessResults();
         },
         // multi
         tokenize: function() {
             var input = this.search.val();
             input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
             if (input != null && input != undefined) {
                 this.search.val(input);
                 if (input.length > 0) {
                     this.open();
+                }
+            }
         },
         // multi
         onSelect: function (data, options) {
             if (!this.triggerSelect(data)) { return; }
+            if (!this.triggerSelect(data) || data.text === "") { return; }
             this.addSelectedChoice(data);
             this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
             // keep track of the search's value before it gets cleared
-            this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val());
+            this.lastSearchTerm = this.search.val();
             this.clearSearch();
             this.updateResults();
             if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true);
             if (this.opts.closeOnSelect) {
                 this.close();
                 this.search.width(10);
             } else {
                 if (this.countSelectableResults()>0) {
                     this.search.width(10);
                     this.resizeSearch();
                     if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
                         // if we reached max selection size repaint the results so choices
                         // are replaced with the max selection reached message
                         this.updateResults(true);
                     } else {
                         // initializes search's value with nextSearchTerm and update search result
                         if(this.nextSearchTerm != undefined){
                             this.search.val(this.nextSearchTerm);
                         if (this.prefillNextSearchTerm()) {
                             this.updateResults();
                             this.search.select();
+                        }
+                    }
                     this.positionDropdown();
                 } else {
                     // if nothing left to select close
                     this.close();
                     this.search.width(10);
+                }
+            }
             // since its not possible to select an element that has already been
             // added we do not need to check if this is a new element before firing change
             this.triggerChange({ added: data });
             if (!options || !options.noFocus)
                 this.focusSearch();
         },
         // multi
         cancel: function () {
             this.close();
             this.focusSearch();
         },
         addSelectedChoice: function (data) {
             var val = this.getVal(), self = this;
             $(data).each(function () {
                 val.push(self.createChoice(this));
             });
             this.setVal(val);
         },
         createChoice: function (data) {
             var enableChoice = !data.locked,
                 enabledItem = $(
                     "<li class='select2-search-choice'>" +
                     "    <div></div>" +
                     "    <a href='#' class='select2-search-choice-close' tabindex='-1'></a>" +
                     "</li>"),
                 disabledItem = $(
                     "<li class='select2-search-choice select2-locked'>" +
                     "<div></div>" +
                     "</li>");
             var choice = enableChoice ? enabledItem : disabledItem,
                 id = this.id(data),
                 val = this.getVal(),
                 formatted,
                 cssClass;
             formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
             if (formatted != undefined) {
-                choice.find("div").replaceWith("<div>"+formatted+"</div>");
+                choice.find("div").replaceWith($("<div></div>").html(formatted));
+            }
             cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
             if (cssClass != undefined) {
                 choice.addClass(cssClass);
+            }
             if(enableChoice){
               choice.find(".select2-search-choice-close")
                   .on("mousedown", killEvent)
                   .on("click dblclick", this.bind(function (e) {
                   if (!this.isInterfaceEnabled()) return;
                   this.unselect($(e.target));
                   this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
                   killEvent(e);
                   this.close();
                   this.focusSearch();
               })).on("focus", this.bind(function () {
                   if (!this.isInterfaceEnabled()) return;
                   this.container.addClass("select2-container-active");
                   this.dropdown.addClass("select2-drop-active");
               }));
+            }
             choice.data("select2-data", data);
             choice.insertBefore(this.searchContainer);
             val.push(id);
             this.setVal(val);
             return id;
         },
         // multi
         unselect: function (selected) {
             var val = this.getVal(),
                 data,
                 index;
             selected = selected.closest(".select2-search-choice");
             if (selected.length === 0) {
                 throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
+            }
             data = selected.data("select2-data");
             if (!data) {
                 // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
                 // and invoked on an element already removed
                 return;
+            }
             var evt = $.Event("select2-removing");
             evt.val = this.id(data);
             evt.choice = data;
@@ @@ -3104,49 +3329,49 @@ the specific language governing permissi @@
         // multi
         postprocessResults: function (data, initial, noHighlightUpdate) {
             var val = this.getVal(),
                 choices = this.results.find(".select2-result"),
                 compound = this.results.find(".select2-result-with-children"),
                 self = this;
             choices.each2(function (i, choice) {
                 var id = self.id(choice.data("select2-data"));
                 if (indexOf(id, val) >= 0) {
                     choice.addClass("select2-selected");
                     // mark all children of the selected parent as selected
                     choice.find(".select2-result-selectable").addClass("select2-selected");
+                }
             });
             compound.each2(function(i, choice) {
                 // hide an optgroup if it doesn't have any selectable children
                 if (!choice.is('.select2-result-selectable')
                     && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
                     choice.addClass("select2-selected");
+                }
             });
             if (this.highlight() == -1 && noHighlightUpdate !== false){
+            if (this.highlight() == -1 && noHighlightUpdate !== false && this.opts.closeOnSelect === true){
                 self.highlight(0);
+            }
             //If all results are chosen render formatNoMatches
             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("<li class='select2-no-results'>" + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "</li>");
+                    }
+                }
+            }
         },
         // multi
         getMaxSearchWidth: function() {
             return this.selection.width() - getSideBorderPadding(this.search);
         },
         // multi
         resizeSearch: function () {
             var minimumWidth, left, maxWidth, containerLeft, searchWidth,
                 sideBorderPadding = getSideBorderPadding(this.search);
@@ @@ -3161,82 +3386,82 @@ the specific language governing permissi @@
             if (searchWidth < minimumWidth) {
                 searchWidth = maxWidth - sideBorderPadding;
+            }
             if (searchWidth < 40) {
                 searchWidth = maxWidth - sideBorderPadding;
+            }
             if (searchWidth <= 0) {
               searchWidth = minimumWidth;
+            }
             this.search.width(Math.floor(searchWidth));
         },
         // multi
         getVal: function () {
             var val;
             if (this.select) {
                 val = this.select.val();
                 return val === null ? [] : val;
             } else {
                 val = this.opts.element.val();
                 return splitVal(val, this.opts.separator);
+                return splitVal(val, this.opts.separator, this.opts.transformVal);
+            }
         },
         // multi
         setVal: function (val) {
             var unique;
             if (this.select) {
                 this.select.val(val);
             } else {
                 unique = [];
+                var unique = [], valMap = {};
                 // filter out duplicates
                 $(val).each(function () {
                     if (indexOf(this, unique) < 0) unique.push(this);
                     if (!(this in valMap)) {
                         unique.push(this);
                         valMap[this] = 0;
+                    }
                 });
                 this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
+            }
         },
         // multi
         buildChangeDetails: function (old, current) {
             var current = current.slice(0),
                 old = old.slice(0);
             // remove intersection from each array
             for (var i = 0; i < current.length; i++) {
                 for (var j = 0; j < old.length; j++) {
                     if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
                         current.splice(i, 1);
                         if(i>0){
                         	i--;
+                        }
                         old.splice(j, 1);
-                        j--;
+                        break;
+                    }
+                }
+            }
             return {added: current, removed: old};
         },
         // multi
         val: function (val, triggerChange) {
             var oldData, self=this;
             if (arguments.length === 0) {
                 return this.getVal();
+            }
             oldData=this.data();
             if (!oldData.length) oldData=[];
             // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
             if (!val && val !== 0) {
                 this.opts.element.val("");
                 this.updateSelection([]);
                 this.clearSearch();
@@ @@ -3364,114 +3589,137 @@ the specific language governing permissi @@
                 method=args[0];
                 if (method === "container") {
                     value = select2.container;
                 } else if (method === "dropdown") {
                     value = select2.dropdown;
                 } else {
                     if (methodsMap[method]) method = methodsMap[method];
                     value = select2[method].apply(select2, args.slice(1));
+                }
                 if (indexOf(args[0], valueMethods) >= 0
                     || (indexOf(args[0], propertyMethods) >= 0 && args.length == 1)) {
                     return false; // abort the iteration, ready to return first matched value
+                }
             } else {
                 throw "Invalid arguments to select2 plugin: " + args;
+            }
         });
         return (value === undefined) ? this : value;
     };
     // plugin defaults, accessible to users
     $.fn.select2.defaults = {
         debug: false,
         width: "copy",
         loadMorePadding: 0,
         closeOnSelect: true,
         openOnEnter: true,
         containerCss: {},
         dropdownCss: {},
         containerCssClass: "",
         dropdownCssClass: "",
         formatResult: function(result, container, query, escapeMarkup) {
             var markup=[];
-            markMatch(result.text, query.term, markup, escapeMarkup);
+            markMatch(this.text(result), query.term, markup, escapeMarkup);
             return markup.join("");
         },
         transformVal: function(val) {
             return $.trim(val);
         },
         formatSelection: function (data, container, escapeMarkup) {
-            return data ? escapeMarkup(data.text) : undefined;
+            return data ? escapeMarkup(this.text(data)) : undefined;
         },
         sortResults: function (results, container, query) {
             return results;
         },
         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"; },
         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,
         maximumSelectionSize: 0,
         id: function (e) { return e == undefined ? null : e.id; },
         text: function (e) {
           if (e && this.data && this.data.text) {
             if ($.isFunction(this.data.text)) {
               return this.data.text(e);
             } else {
               return e[this.data.text];
+            }
           } else {
             return e.text;
+          }
         },
         matcher: function(term, text) {
             return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0;
         },
         separator: ",",
         tokenSeparators: [],
         tokenizer: defaultTokenizer,
         escapeMarkup: defaultEscapeMarkup,
         blurOnChange: false,
         selectOnBlur: false,
         adaptContainerCssClass: function(c) { return c; },
         adaptDropdownCssClass: function(c) { return null; },
         nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; },
         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;
+            }
             return true;
+        }
     };
     $.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: {
             type: "GET",
             cache: false,
             dataType: "json"
+        }
     };
     // exports
     window.Select2 = {
         query: {
             ajax: ajax,
             local: local,
             tags: tags
         }, util: {
             debounce: debounce,
             markMatch: markMatch,
             escapeMarkup: defaultEscapeMarkup,
             stripDiacritics: stripDiacritics
         }, "class": {
             "abstract": AbstractSelect2,
             "single": SingleSelect2,
             "multi": MultiSelect2

0 comments (0 inline, 0 general)