From d62bc5bef1ff6696262c3eb03334c553dc68f897 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 12 Jun 2012 19:41:21 -0700
Subject: [PATCH 01/55] various small fixes. closes #99

---
 select2.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/select2.js b/select2.js
index e2a8db5c..788d1ed9 100755
--- a/select2.js
+++ b/select2.js
@@ -70,7 +70,7 @@
     function indexOf(value, array) {
         var i = 0, l = array.length, v;
 
-        if (typeof value == 'undefined') {
+        if (typeof value === "undefined") {
           return -1;
         }
 
@@ -244,7 +244,6 @@
                         }
                         // TODO 3.0 - replace query.page with query so users have access to term, page, etc.
                         var results = options.results(data, query.page);
-                        self.context = results.context;
                         query.callback(results);
                     }
                 });
@@ -678,8 +677,8 @@
                 this.opts.query({
                         term: this.search.val(),
                         page: page,
-                        context: self.context,
-                        matcher: self.opts.matcher,
+                        context: this.context,
+                        matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
                     var parts = [], self = this;
                     $(data.results).each(function () {
@@ -740,6 +739,9 @@
                 var parts = [], // html parts
                     def; // default choice
 
+                // 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(null, search.val(), data.results);
@@ -1478,7 +1480,6 @@
                 val = (val === null) ? [] : val;
                 this.setVal(val);
                 // val is a list of objects
-                                                                                                     st
                 $(val).each(function () { data.push(self.id(this)); });
                 this.setVal(data);
                 this.updateSelection(val);

From 2f3262d39e08348103d1b420ab3f341d5e87368f Mon Sep 17 00:00:00 2001
From: Christopher Nadeau <chris@nadeau.ws>
Date: Tue, 12 Jun 2012 09:40:37 +0100
Subject: [PATCH 02/55] Absolutely position dropdown. fixes #84.

Changes to detach dropdown and append to body, and absolutely position
dropdown. Fixes clipping problems with overflowing.

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.css | 36 ++++++++++++++++----------------
 select2.js  | 60 +++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/select2.css b/select2.css
index 244dc03e..660fcb49 100755
--- a/select2.css
+++ b/select2.css
@@ -13,11 +13,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 .select2-container,
 .select2-drop,
 .select2-search,
-.select2-container .select2-search input{
-  /* 
+.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
   */
   -moz-box-sizing: border-box;    /* firefox */
@@ -83,7 +83,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   cursor: pointer;
 }
 
-.select2-container .select2-drop {
+.select2-drop {
     background: #fff;
     border: 1px solid #aaa;
     border-top: 0;
@@ -133,7 +133,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     height: 100%;
 }
 
-.select2-container .select2-search {
+.select2-search {
   display: inline-block;
     white-space: nowrap;
     z-index: 1010;
@@ -144,13 +144,13 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   padding-right: 4px;
 }
 
-.select2-container .select2-search-hidden {
+.select2-search-hidden {
   display: block;
   position: absolute;
   left: -10000px;
 }
 
-.select2-container .select2-search input {
+.select2-search input {
     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, white), color-stop(0.99, #eeeeee));
     background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
@@ -172,10 +172,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     box-shadow: none;
     border-radius: 0;
     -moz-border-radius: 0;
-    -webkit-border-radius: 0;  
+    -webkit-border-radius: 0;
 }
 
-.select2-container .select2-search input.select2-active {
+.select2-search input.select2-active {
     background: #fff url('spinner.gif') no-repeat 100%;
     background: url('spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
     background: url('spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
@@ -228,7 +228,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 /* results */
-.select2-container .select2-results {
+.select2-results {
   margin: 4px 4px 4px 0;
   padding: 0 0 0 4px;
   position: relative;
@@ -236,7 +236,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   overflow-y: auto;
   max-height: 200px;
 }
-.select2-container .select2-results li {
+.select2-results li {
   line-height: 80%;
   padding: 7px 7px 8px;
   margin: 0;
@@ -245,37 +245,37 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   display: list-item;
 }
 
-.select2-container .select2-results .select2-highlighted {
+.select2-results .select2-highlighted {
   background: #3875d7;
   color: #fff;
 }
-.select2-container .select2-results li em {
+.select2-results li em {
   background: #feffde;
   font-style: normal;
 }
-.select2-container .select2-results .select2-highlighted em {
+.select2-results .select2-highlighted em {
   background: transparent;
 }
-.select2-container .select2-results .select2-no-results {
+.select2-results .select2-no-results {
   background: #f4f4f4;
   display: list-item;
 }
 
 /*
 disabled look for already selected choices in the results dropdown
-.select2-container .select2-results .select2-disabled.select2-highlighted {
+.select2-results .select2-disabled.select2-highlighted {
     color: #666;
     background: #f4f4f4;
     display: list-item;
     cursor: default;
 }
-.select2-container .select2-results .select2-disabled {
+.select2-results .select2-disabled {
   background: #f4f4f4;
   display: list-item;
   cursor: default;
 }
 */
-.select2-container .select2-results .select2-disabled {
+.select2-results .select2-disabled {
     display: none;
 }
 
diff --git a/select2.js b/select2.js
index e2a8db5c..ce449eca 100755
--- a/select2.js
+++ b/select2.js
@@ -1,6 +1,6 @@
 /*
  Copyright 2012 Igor Vaynberg
- 
+
  Version: @@ver@@ Timestamp: @@timestamp@@
 
  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
@@ -319,9 +319,16 @@
     $(document).ready(function () {
         $(document).delegate("*", "mousedown focusin touchend", function (e) {
             var target = $(e.target).closest("div.select2-container").get(0);
-            $(document).find("div.select2-container-active").each(function () {
-                if (this !== target) $(this).data("select2").blur();
-            });
+            if (target) {
+                $(document).find("div.select2-container-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            } else {
+                target = $(e.target).closest("div.select2-drop").get(0);
+                $(document).find("div.select2-drop-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            }
         });
     });
 
@@ -378,8 +385,11 @@
             this.container.data("select2", this);
 
             this.dropdown = this.container.find(".select2-drop");
+            this.dropdown.data("select2", this);
+
             this.results = results = this.container.find(resultsSelector);
             this.search = search = this.container.find("input[type=text]");
+            this.dropdown.detach().appendTo('body');
 
             this.resultsPage = 0;
             this.context = null;
@@ -388,10 +398,10 @@
             this.initContainer();
 
             installFilteredMouseMove(this.results);
-            this.container.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
+            this.dropdown.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
 
             installDebouncedScroll(80, this.results);
-            this.container.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));
+            this.dropdown.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));
 
             // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
             if ($.fn.mousewheel) {
@@ -412,7 +422,7 @@
             search.bind("focus", function () { search.addClass("select2-focused");});
             search.bind("blur", function () { search.removeClass("select2-focused");});
 
-            this.container.delegate(resultsSelector, "click", this.bind(function (e) {
+            this.dropdown.delegate(resultsSelector, "click", this.bind(function (e) {
                 if ($(e.target).closest(".select2-result:not(.select2-disabled)").length > 0) {
                     this.highlightUnderEvent(e);
                     this.selectHighlighted(e);
@@ -438,6 +448,7 @@
             var select2 = this.opts.element.data("select2");
             if (select2 !== undefined) {
                 select2.container.remove();
+                select2.dropdown.remove();
                 select2.opts.element
                     .removeData("select2")
                     .unbind(".select2")
@@ -568,10 +579,26 @@
             return this.container.hasClass("select2-dropdown-open");
         },
 
+        updatePositions: function() {
+            var offset = this.container.offset();
+            var height = this.container.outerHeight();
+            var width  = this.container.outerWidth();
+
+            this.dropdown.css({
+                top: offset.top + height,
+                left: offset.left,
+                width: width,
+                'max-height': 300
+            });
+        },
+
         open: function () {
             if (this.opened()) return;
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+            this.dropdown.addClass("select2-drop-active");
+
+            this.updatePositions();
 
             this.updateResults(true);
             this.dropdown.show();
@@ -787,6 +814,7 @@
             window.setTimeout(this.bind(function () {
                 this.close();
                 this.container.removeClass("select2-container-active");
+                this.dropdown.removeClass("select2-drop-active");
                 this.clearSearch();
                 this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
                 this.search.blur();
@@ -888,7 +916,11 @@
 
         initContainer: function () {
 
-            var selection, container = this.container, clickingInside = false,
+            var selection,
+                container = this.container,
+                dropdown = this.dropdown,
+                containerGroup = $([this.container.get(0), this.dropdown.get(0)]),
+                clickingInside = false,
                 selector = ".select2-choice";
 
             this.selection = selection = container.find(selector);
@@ -912,7 +944,7 @@
                 }
             }));
 
-            container.delegate(selector, "click", this.bind(function (e) {
+            containerGroup.delegate(selector, "click", this.bind(function (e) {
                 clickingInside = true;
 
                 if (this.opened()) {
@@ -925,7 +957,7 @@
 
                 clickingInside = false;
             }));
-            container.delegate(selector, "keydown", this.bind(function (e) {
+            containerGroup.delegate(selector, "keydown", this.bind(function (e) {
                 if (!this.enabled || e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
                     return;
                 }
@@ -939,8 +971,8 @@
                     killEvent(e);
                 }
             }));
-            container.delegate(selector, "focus", function () { if (this.enabled) container.addClass("select2-container-active"); });
-            container.delegate(selector, "blur", this.bind(function () {
+            containerGroup.delegate(selector, "focus", function () { if (this.enabled) { containerGroup.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
+            containerGroup.delegate(selector, "blur", this.bind(function () {
                 if (clickingInside) return;
                 if (!this.opened()) this.blur();
             }));
@@ -1206,6 +1238,7 @@
             this.container.delegate(selector, "focus", this.bind(function () {
                 if (!this.enabled) return;
                 this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
                 this.clearPlaceholder();
             }));
 
@@ -1357,6 +1390,7 @@
             })).bind("focus", this.bind(function () {
                 if (!this.enabled) return;
                 this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
             }));
 
             choice.data("select2-data", data);
@@ -1522,7 +1556,7 @@
         var args = Array.prototype.slice.call(arguments, 0),
             opts,
             select2,
-            value, multiple, allowedMethods = ["val", "destroy", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable"];
+            value, multiple, allowedMethods = ["val", "destroy", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable", "updatePositions"];
 
         this.each(function () {
             if (args.length === 0 || typeof(args[0]) === "object") {

From efccc62510ec318d58a46bad22188155cf28c5b8 Mon Sep 17 00:00:00 2001
From: Christopher Nadeau <chris@nadeau.ws>
Date: Tue, 12 Jun 2012 09:49:48 +0100
Subject: [PATCH 03/55] Few tweaks to multi style

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.css | 10 ----------
 select2.js  |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/select2.css b/select2.css
index 660fcb49..de67c8e5 100755
--- a/select2.css
+++ b/select2.css
@@ -324,10 +324,6 @@ disabled look for already selected choices in the results dropdown
       position: relative;
 }
 
-.select2-container-multi .select2-drop {
-    margin-top:0;
-}
-
 .select2-container-multi .select2-choices {
     min-height: 26px;
 }
@@ -428,12 +424,6 @@ disabled look for already selected choices in the results dropdown
   background-position: right -11px;
 }
 
-
-.select2-container-multi .select2-results {
-  margin: -1px 0 0;
-  padding: 0;
-}
-
 /* disabled styles */
 
 .select2-container-multi.select2-container-disabled .select2-choices{
diff --git a/select2.js b/select2.js
index ce449eca..323b63ab 100755
--- a/select2.js
+++ b/select2.js
@@ -1136,7 +1136,7 @@
                 "    <input type='text' autocomplete='off' style='width: 25px;'>" ,
                 "  </li>" ,
                 "</ul>" ,
-                "<div class='select2-drop' style='display:none;'>" ,
+                "<div class='select2-drop select2-drop-multi' style='display:none;'>" ,
                 "   <ul class='select2-results'>" ,
                 "   </ul>" ,
                 "</div>"].join(""));

From 6151ddbb0dc1e050160495c56056c17764520e7d Mon Sep 17 00:00:00 2001
From: Christopher Nadeau <chris@nadeau.ws>
Date: Tue, 12 Jun 2012 12:35:56 +0100
Subject: [PATCH 04/55] Add support for hierarchies and unselectable items.
 issue #58

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.css |  16 ++++-
 select2.js  | 166 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 145 insertions(+), 37 deletions(-)

diff --git a/select2.css b/select2.css
index de67c8e5..883af077 100755
--- a/select2.css
+++ b/select2.css
@@ -236,13 +236,25 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   overflow-y: auto;
   max-height: 200px;
 }
+
+.select2-results ul.select2-result-sub {
+  margin: 0 0 0 15px;
+}
+
 .select2-results li {
+  list-style: none;
+  display: list-item;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+  font-weight: bold;
+}
+
+.select2-results .select2-result-label {
   line-height: 80%;
   padding: 7px 7px 8px;
   margin: 0;
-  list-style: none;
   cursor: pointer;
-  display: list-item;
 }
 
 .select2-results .select2-highlighted {
diff --git a/select2.js b/select2.js
index 323b63ab..22b5807c 100755
--- a/select2.js
+++ b/select2.js
@@ -20,7 +20,7 @@
         return;
     }
 
-    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2;
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, uid = 1;;
 
     KEY = {
         TAB: 9,
@@ -475,8 +475,46 @@
             }
 
             opts = $.extend({}, {
-                formatResult: function (data) { return data.text; },
-                formatSelection: function (data) { return data.text; },
+                formatList: function(results) {
+                    var proc = function(results, depth) {
+                        depth = depth || 0;
+                        var parts = [];
+
+                        $.each(results, function() {
+                            var result = this;
+                            parts.push('<li class="select2-result select2-result-uid-' + result.uid + ' select2-result-depth-' + depth);
+                            if (result.unselectable) {
+                                parts.push(' select2-result-unselectable');
+                            }
+                            if (result.children && result.children.length) {
+                                parts.push(' select2-result-with-children');
+                            }
+                            parts.push('" data-select2-uid="' + result.uid + '">');
+
+                            parts.push('<div class="select2-result-label">' + result.text + '</div>');
+
+                            if (result.children && result.children.length) {
+                                parts.push('<ul class="select2-result-sub">');
+                                parts.push(proc(result.children, depth + 1))
+                                parts.push('</ul>');
+                            }
+
+                            parts.push('</li>');
+                        });
+
+
+                        return parts.join('');
+                    };
+
+                    return proc(results, 0);
+                },
+                formatSelection: function (data) {
+                    if (data.fullText) {
+                        return data.fullText;
+                    } else {
+                        return data.text;
+                    }
+                },
                 formatNoMatches: function () { return "No matches found"; },
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
                 minimumResultsForSearch: 0,
@@ -494,19 +532,80 @@
 
             if (select) {
                 opts.query = this.bind(function (query) {
-                    var data = {results: [], more: false},
+                    var data = {results: [], map: {}, more: false},
                         term = query.term,
+                        idx = 0,
                         placeholder = this.getPlaceholder();
-                    element.find("option").each(function (i) {
-                        var e = $(this),
-                            text = e.text();
 
-                        if (i === 0 && placeholder !== undefined && text === "") return true;
+                    element.find("> *").each(function() {
+                        var el = $(this);
 
-                        if (query.matcher(term, text)) {
-                            data.results.push({id: e.attr("value"), text: text});
+                        if (el.is('optgroup')) {
+                            var item = {
+                                id: 'select2-group-' + (uid++),
+                                uid: uid++,
+                                text: el.attr('label'),
+                                unselectable: true,
+                                children: []
+                            };
+                            data.map[item.uid] = item;
+
+                            el.find('> option').each(function() {
+                                var sub = {
+                                    id: $(this).attr('value'),
+                                    uid: uid++,
+                                    text: $(this).text(),
+                                    unselectable: false,
+                                    fullText: el.attr('label') + ' > ' + $(this).text(),
+                                    children: []
+                                };
+
+                                data.map[sub.uid] = sub;
+                                item.children.push(sub);
+                            });
+
+                            data.results.push(item);
+                        } else {
+                            var item = {
+                                id: $(this).attr('value'),
+                                uid: uid++,
+                                text: $(this).text(),
+                                unselectable: false,
+                                children: []
+                            };
+
+                            data.map[item.uid] = item;
+                            data.results.push(item);
                         }
                     });
+
+                    if (term !== "") {
+                        var filterDeep = function(items, depth) {
+                            var filtered = [];
+                            for (var itemIdx = 0; itemIdx < items.length; itemIdx++) {
+                                var newItem = $.extend(true, [], items[itemIdx]);
+                                if (newItem.children) {
+                                    newItem.children = filterDeep(newItem.children);
+                                }
+
+                                var isMatch = false;
+                                if (newItem.children && newItem.children.length) {
+                                    isMatch = true;
+                                } else if (!newItem.unselectable && query.matcher(term, newItem.text)) {
+                                    isMatch = true;
+                                }
+
+                                if (isMatch) {
+                                    filtered.push(newItem);
+                                }
+                            }
+
+                            return filtered;
+                        }
+
+                        data.results = filterDeep(data.results);
+                    }
+
                     query.callback(data);
                 });
                 // this is needed because inside val() we construct choices from options and there id is hardcoded
@@ -622,7 +721,7 @@
         ensureHighlightVisible: function () {
             var results = this.results, children, index, child, hb, rb, y, more;
 
-            children = results.children(".select2-result");
+            children = results.find(".select2-result");
             index = this.highlight();
 
             if (index < 0) return;
@@ -652,7 +751,7 @@
         },
 
         moveHighlight: function (delta) {
-            var choices = this.results.children(".select2-result"),
+            var choices = this.results.find(".select2-result"),
                 index = this.highlight();
 
             while (index > -1 && index < choices.length) {
@@ -665,17 +764,21 @@
         },
 
         highlight: function (index) {
-            var choices = this.results.children(".select2-result");
+            var choices = this.results.find(".select2-result .select2-result-label");
 
             if (arguments.length === 0) {
                 return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
             }
 
-            choices.removeClass("select2-highlighted");
-
             if (index >= choices.length) index = choices.length - 1;
             if (index < 0) index = 0;
 
+            if ($(choices[index]).parent().is('.select2-result-unselectable')) {
+                return;
+            }
+
+            choices.removeClass("select2-highlighted");
+
             $(choices[index]).addClass("select2-highlighted");
             this.ensureHighlightVisible();
 
@@ -684,8 +787,9 @@
 
         highlightUnderEvent: function (event) {
             var el = $(event.target).closest(".select2-result");
+            var choices = this.results.find('.select2-result');
             if (el.length > 0) {
-                this.highlight(el.index());
+                this.highlight(choices.index(el));
             }
         },
 
@@ -708,19 +812,15 @@
                         context: self.context,
                         matcher: self.opts.matcher,
                         callback: this.bind(function (data) {
-                    var parts = [], self = this;
-                    $(data.results).each(function () {
-                        parts.push("<li class='select2-result'>");
-                        parts.push(self.opts.formatResult(this));
-                        parts.push("</li>");
-                    });
-                    more.before(parts.join(""));
-                    results.find(".select2-result").each(function (i) {
+                    var self = this;
+                    var htmlResult = self.opts.formatList(data.results);
+                    more.before(htmlResult);
+                    results.find(".select2-result").each(function () {
                         var e = $(this);
                         if (e.data("select2-data") !== undefined) {
                             offset = i;
                         } else {
-                            e.data("select2-data", data.results[i - offset - 1]);
+                            e.data("select2-data", data.map[e.data('select2-uid')]);
                         }
                     });
                     if (data.more) {
@@ -785,19 +885,15 @@
                     return;
                 }
 
-                $(data.results).each(function () {
-                    parts.push("<li class='select2-result'>");
-                    parts.push(opts.formatResult(this));
-                    parts.push("</li>");
-                });
+                var htmlResult = self.opts.formatList(data.results);
 
                 if (data.more === true) {
-                    parts.push("<li class='select2-more-results'>Loading more results...</li>");
+                    htmlResult += "<li class='select2-more-results'>Loading more results...</li>";
                 }
 
-                render(parts.join(""));
-                results.children(".select2-result").each(function (i) {
-                    var d = data.results[i];
+                render(htmlResult);
+                results.find(".select2-result").each(function () {
+                    var d = data.map[$(this).data('select2-uid')];
                     $(this).data("select2-data", d);
                 });
                 this.postprocessResults(data, initial);
@@ -830,7 +926,7 @@
         },
 
         selectHighlighted: function () {
-            var data = this.results.find(".select2-highlighted:not(.select2-disabled)").data("select2-data");
+            var data = this.results.find(".select2-highlighted").not(".select2-disabled").closest('.select2-result').not('.select2-result-unselectable').data("select2-data");
             if (data) {
                 this.onSelect(data);
             }

From b18db15f1e0bd786f5f3def1a3ab22952d618041 Mon Sep 17 00:00:00 2001
From: Christopher Nadeau <chris@nadeau.ws>
Date: Tue, 12 Jun 2012 12:39:51 +0100
Subject: [PATCH 05/55] Tweak sub-item css a bit to make blue go full width

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/select2.css b/select2.css
index 883af077..1a7188a5 100755
--- a/select2.css
+++ b/select2.css
@@ -238,9 +238,17 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 .select2-results ul.select2-result-sub {
-  margin: 0 0 0 15px;
+  margin: 0 0 0 0;
 }
 
+.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
+.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
+
 .select2-results li {
   list-style: none;
   display: list-item;

From a6eeadbe7a4a48ea60d03ee44ef9aea425b81bf4 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 12 Jun 2012 21:57:53 -0700
Subject: [PATCH 06/55] always detach and append the dropdown on open. this
 ensures it will be the last element in body and thus have the highest
 z-index. issue #105. issue #84

---
 select2.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 22b5807c..10981284 100755
--- a/select2.js
+++ b/select2.js
@@ -389,7 +389,6 @@
 
             this.results = results = this.container.find(resultsSelector);
             this.search = search = this.container.find("input[type=text]");
-            this.dropdown.detach().appendTo('body');
 
             this.resultsPage = 0;
             this.context = null;
@@ -695,7 +694,7 @@
             if (this.opened()) return;
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-            this.dropdown.addClass("select2-drop-active");
+            this.dropdown.detach().appendTo('body').addClass("select2-drop-active");
 
             this.updatePositions();
 

From 0ccfd4853c6f607f0aefc216eb5b10682a68d82b Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 12 Jun 2012 21:59:39 -0700
Subject: [PATCH 07/55] rename updatePositions() to positionDropdown(). more
 clear

---
 select2.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/select2.js b/select2.js
index 10981284..b3ce40c3 100755
--- a/select2.js
+++ b/select2.js
@@ -677,7 +677,7 @@
             return this.container.hasClass("select2-dropdown-open");
         },
 
-        updatePositions: function() {
+        positionDropdown: function() {
             var offset = this.container.offset();
             var height = this.container.outerHeight();
             var width  = this.container.outerWidth();
@@ -696,7 +696,7 @@
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
             this.dropdown.detach().appendTo('body').addClass("select2-drop-active");
 
-            this.updatePositions();
+            this.positionDropdown();
 
             this.updateResults(true);
             this.dropdown.show();
@@ -1651,7 +1651,7 @@
         var args = Array.prototype.slice.call(arguments, 0),
             opts,
             select2,
-            value, multiple, allowedMethods = ["val", "destroy", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable", "updatePositions"];
+            value, multiple, allowedMethods = ["val", "destroy", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable", "positionDropdown"];
 
         this.each(function () {
             if (args.length === 0 || typeof(args[0]) === "object") {

From 9fc18a9ca80cad73f8fc69fe2bc023d6ac0469dd Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 12 Jun 2012 22:12:53 -0700
Subject: [PATCH 08/55] minor cleanup

---
 select2.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/select2.js b/select2.js
index b3ce40c3..572fac23 100755
--- a/select2.js
+++ b/select2.js
@@ -685,8 +685,7 @@
             this.dropdown.css({
                 top: offset.top + height,
                 left: offset.left,
-                width: width,
-                'max-height': 300
+                width: width
             });
         },
 
@@ -1014,7 +1013,7 @@
             var selection,
                 container = this.container,
                 dropdown = this.dropdown,
-                containerGroup = $([this.container.get(0), this.dropdown.get(0)]),
+                containers = $([this.container.get(0), this.dropdown.get(0)]),
                 clickingInside = false,
                 selector = ".select2-choice";
 
@@ -1039,7 +1038,7 @@
                 }
             }));
 
-            containerGroup.delegate(selector, "click", this.bind(function (e) {
+            containers.delegate(selector, "click", this.bind(function (e) {
                 clickingInside = true;
 
                 if (this.opened()) {
@@ -1052,7 +1051,7 @@
 
                 clickingInside = false;
             }));
-            containerGroup.delegate(selector, "keydown", this.bind(function (e) {
+            containers.delegate(selector, "keydown", this.bind(function (e) {
                 if (!this.enabled || e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
                     return;
                 }
@@ -1066,8 +1065,8 @@
                     killEvent(e);
                 }
             }));
-            containerGroup.delegate(selector, "focus", function () { if (this.enabled) { containerGroup.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
-            containerGroup.delegate(selector, "blur", this.bind(function () {
+            containers.delegate(selector, "focus", function () { if (this.enabled) { containerGroup.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
+            containers.delegate(selector, "blur", this.bind(function () {
                 if (clickingInside) return;
                 if (!this.opened()) this.blur();
             }));

From cd538772dfc2d99da152f9f171a76ebdc0a42827 Mon Sep 17 00:00:00 2001
From: Johan Buts <johan.buts@trustedarea.com>
Date: Wed, 13 Jun 2012 13:09:43 +0200
Subject: [PATCH 09/55] Fixed issue with defining the text property as string
 because data gets reset afterwards also look at failing example #e10_2

---
 select2.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index e2a8db5c..829b43ec 100755
--- a/select2.js
+++ b/select2.js
@@ -267,13 +267,17 @@
      * the text.
      */
     function local(options) {
-        var data = options, // data elements
+        var data = options, // data elements,
+            dataText = '',
             text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
 
         if (!$.isArray(data)) {
             text = data.text;
             // if text is not a function we assume it to be a key name
-            if (!$.isFunction(text)) text = function (item) { return item[data.text]; };
+            if (!$.isFunction(text)) {
+              dataText = data.text; // we need to store this in a seperate variable because in the next step data gets reset and data.text is no longer available
+              text = function (item) { return item[dataText]; };
+            }
             data = data.results;
         }
 

From 460cd059f91200c09b53c3556535cb7894ef4321 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 14 Jun 2012 09:06:37 +1200
Subject: [PATCH 10/55] Fix typo in comment

---
 select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index e2a8db5c..87f96c85 100755
--- a/select2.js
+++ b/select2.js
@@ -90,7 +90,7 @@
     }
 
     /**
-     * Compares equality of a and b taking into account that a and b may be strings, in which case localCompare is used
+     * Compares equality of a and b taking into account that a and b may be strings, in which case localeCompare is used
      * @param a
      * @param b
      */

From 55fd00169e344cfb3f49f062dc317416ba05be15 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Jun 2012 00:21:22 -0700
Subject: [PATCH 11/55] simplify optgroup querying and rendering code. provide
 a more powerful populateResults() function fixes #58. fixes #105. fixes #84

---
 select2.js | 204 ++++++++++++++++++++++-------------------------------
 1 file changed, 84 insertions(+), 120 deletions(-)

diff --git a/select2.js b/select2.js
index 572fac23..10bb75fc 100755
--- a/select2.js
+++ b/select2.js
@@ -20,7 +20,7 @@
         return;
     }
 
-    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, uid = 1;;
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid;
 
     KEY = {
         TAB: 9,
@@ -67,6 +67,8 @@
         }
     };
 
+    nextUid=(function() { var counter=1; return function() { return counter++; }}());
+
     function indexOf(value, array) {
         var i = 0, l = array.length, v;
 
@@ -474,38 +476,58 @@
             }
 
             opts = $.extend({}, {
-                formatList: function(results) {
-                    var proc = function(results, depth) {
-                        depth = depth || 0;
-                        var parts = [];
+                populateResults: function(container, results) {
+                    var uidToData={}, populate, markup=[], uid, data, result, children;
 
-                        $.each(results, function() {
-                            var result = this;
-                            parts.push('<li class="select2-result select2-result-uid-' + result.uid + ' select2-result-depth-' + depth);
-                            if (result.unselectable) {
-                                parts.push(' select2-result-unselectable');
-                            }
-                            if (result.children && result.children.length) {
-                                parts.push(' select2-result-with-children');
-                            }
-                            parts.push('" data-select2-uid="' + result.uid + '">');
+                    populate=function(results, depth) {
 
-                            parts.push('<div class="select2-result-label">' + result.text + '</div>');
+                        var i, l, uid, result, selectable, compound;
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
 
-                            if (result.children && result.children.length) {
-                                parts.push('<ul class="select2-result-sub">');
-                                parts.push(proc(result.children, depth + 1))
-                                parts.push('</ul>');
+                            result=results[i];
+                            selectable=("id" in result); // TODO switch to id() function
+                            compound=("children" in result) && result.children.length > 0;
+
+                            markup.push("<li class='select2-result-depth-"+depth);
+                            if (!selectable) { markup.push(" select2-result-unselectable"); } else { markup.push(" select2-result");}
+                            if (compound) { markup.push(" select2-result-with-children"); }
+
+                            markup.push("'");
+
+                            if (selectable) {
+                                uid=nextUid();
+                                markup.push(" id='select2-result-"+uid+"'");
+                                uidToData[uid]=result;
                             }
 
-                            parts.push('</li>');
-                        });
+                            markup.push("><div class='select2-result-label'>"+opts.formatResult(result)+"</div>");
 
+                            if (compound) {
+                                markup.push("<ul class='select2-result-sub'>");
+                                populate(result.children, depth + 1);
+                                markup.push("</ul>");
+                            }
 
-                        return parts.join('');
+                            markup.push("</li>");
+                        }
                     };
 
-                    return proc(results, 0);
+                    populate(results, 0);
+
+                    children=container.children();
+                    if (children.length==0) {
+                        container.html(markup.join(""));
+                    } else {
+                        $(children[children.length-1]).append(markup.join(""));
+                    }
+
+                    for (uid in uidToData) {
+                        $("#select2-result-"+uid).data("select2-data", uidToData[uid]);
+                    }
+
+                },
+                formatResult: function(result) {
+                     return result.text;
                 },
                 formatSelection: function (data) {
                     if (data.fullText) {
@@ -531,79 +553,26 @@
 
             if (select) {
                 opts.query = this.bind(function (query) {
-                    var data = {results: [], map: {}, more: false},
+                    var data = { results: [], more: false },
                         term = query.term,
-                        idx = 0,
-                        placeholder = this.getPlaceholder();
+                        process;
 
-                    element.find("> *").each(function() {
-                        var el = $(this);
-
-                        if (el.is('optgroup')) {
-                            var item = {
-                                id: 'select2-group-' + (uid++),
-                                uid: uid++,
-                                text: el.attr('label'),
-                                unselectable: true,
-                                children: []
-                            };
-                            data.map[item.uid] = item;
-
-                            el.find('> option').each(function() {
-                                var sub = {
-                                    id: $(this).attr('value'),
-                                    uid: uid++,
-                                    text: $(this).text(),
-                                    unselectable: false,
-                                    fullText: el.attr('label') + ' > ' + $(this).text(),
-                                    children: []
-                                };
-
-                                data.map[sub.uid] = sub;
-                                item.children.push(sub);
-                            });
-
-                            data.results.push(item);
-                        } else {
-                            var item = {
-                                id: $(this).attr('value'),
-                                uid: uid++,
-                                text: $(this).text(),
-                                unselectable: false,
-                                children: []
-                            };
-
-                            data.map[item.uid] = item;
-                            data.results.push(item);
-                        }
-                    });
-
-                    if (term !== "") {
-                        var filterDeep = function(items, depth) {
-                            var filtered = [];
-                            for (var itemIdx = 0; itemIdx < items.length; itemIdx++) {
-                                var newItem = $.extend(true, [], items[itemIdx]);
-                                if (newItem.children) {
-                                    newItem.children = filterDeep(newItem.children);
-                                }
-
-                                var isMatch = false;
-                                if (newItem.children && newItem.children.length) {
-                                    isMatch = true;
-                                } else if (!newItem.unselectable && query.matcher(term, newItem.text)) {
-                                    isMatch = true;
-                                }
-
-                                if (isMatch) {
-                                    filtered.push(newItem);
-                                }
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text())) {
+                                collection.push({id:element.attr("value"), text:element.text()});
+                            }
+                        } else if (element.is("optgroup")) {
+                            group={text:element.attr("label"), children:[]};
+                            element.children().each(function() { process($(this), group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
                             }
-
-                            return filtered;
                         }
+                    };
 
-                        data.results = filterDeep(data.results);
-                    }
+                    element.children().each(function() { process($(this), data.results); });
 
                     query.callback(data);
                 });
@@ -796,10 +765,10 @@
                 more = results.find("li.select2-more-results"),
                 below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
                 offset = -1, // index of first element without data
-                page = this.resultsPage + 1;
+                page = this.resultsPage + 1,
+                self=this;
 
             if (more.length === 0) return;
-
             below = more.offset().top - results.offset().top - results.height();
 
             if (below <= 0) {
@@ -807,26 +776,21 @@
                 this.opts.query({
                         term: this.search.val(),
                         page: page,
-                        context: self.context,
-                        matcher: self.opts.matcher,
+                        context: this.context,
+                        matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
-                    var self = this;
-                    var htmlResult = self.opts.formatList(data.results);
-                    more.before(htmlResult);
-                    results.find(".select2-result").each(function () {
-                        var e = $(this);
-                        if (e.data("select2-data") !== undefined) {
-                            offset = i;
-                        } else {
-                            e.data("select2-data", data.map[e.data('select2-uid')]);
-                        }
-                    });
-                    if (data.more) {
+                            console.log("load more callback", data);
+
+                    self.opts.populateResults(results, data.results);
+
+                    if (data.more===true) {
+                        more.detach();
+                        results.children().filter(":last").append(more);
                         more.removeClass("select2-active");
                     } else {
                         more.remove();
                     }
-                    this.resultsPage = page;
+                    self.resultsPage = page;
                 })});
             }
         },
@@ -844,12 +808,16 @@
 
             search.addClass("select2-active");
 
-            function render(html) {
-                results.html(html);
+            function postRender() {
                 results.scrollTop(0);
                 search.removeClass("select2-active");
             }
 
+            function render(html) {
+                results.html(html);
+                postRender();
+            }
+
             if (search.val().length < opts.minimumInputLength) {
                 render("<li class='select2-no-results'>" + opts.formatInputTooShort(search.val(), opts.minimumInputLength) + "</li>");
                 return;
@@ -862,8 +830,7 @@
                     context: null,
                     matcher: opts.matcher,
                     callback: this.bind(function (data) {
-                var parts = [], // html parts
-                    def; // default choice
+                var def; // default choice
 
                 // create a default choice and prepend it to the list
                 if (this.opts.createSearchChoice && search.val() !== "") {
@@ -883,17 +850,14 @@
                     return;
                 }
 
-                var htmlResult = self.opts.formatList(data.results);
+                results.empty();
+                self.opts.populateResults(results, data.results);
+                postRender();
 
                 if (data.more === true) {
-                    htmlResult += "<li class='select2-more-results'>Loading more results...</li>";
+                    results.children().filter(":last").append("<li class='select2-more-results'>Loading more results...</li>");
                 }
 
-                render(htmlResult);
-                results.find(".select2-result").each(function () {
-                    var d = data.map[$(this).data('select2-uid')];
-                    $(this).data("select2-data", d);
-                });
                 this.postprocessResults(data, initial);
             })});
         },

From 277ae4ff5ab604635b5dca3c3ec1d98ed1dfe0d5 Mon Sep 17 00:00:00 2001
From: Pier-Olivier Thibault <pothibo@gmail.com>
Date: Thu, 14 Jun 2012 07:14:49 -0400
Subject: [PATCH 12/55] Added zindex options to dropdown so we can make sure it
 presents itself on top of whatever is existing in the DOM

---
 select2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index 7f3cbe37..7ac2f77d 100755
--- a/select2.js
+++ b/select2.js
@@ -539,6 +539,7 @@
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
                 minimumResultsForSearch: 0,
                 minimumInputLength: 0,
+                zIndex: 2000,
                 id: function (e) { return e.id; },
                 matcher: function(term, text) {
                     return text.toUpperCase().indexOf(term.toUpperCase()) >= 0;
@@ -653,7 +654,8 @@
             this.dropdown.css({
                 top: offset.top + height,
                 left: offset.left,
-                width: width
+                width: width,
+                "z-index": this.opts.zIndex
             });
         },
 

From 5941fcea25fc7e82f7bc134289647381edd19096 Mon Sep 17 00:00:00 2001
From: Pier-Olivier Thibault <pothibo@gmail.com>
Date: Thu, 14 Jun 2012 12:03:38 -0400
Subject: [PATCH 13/55] Using dropdownZIndex as opts. Dropping default value so
 use can set it via css.

---
 select2.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/select2.js b/select2.js
index 7ac2f77d..55836c72 100755
--- a/select2.js
+++ b/select2.js
@@ -539,7 +539,6 @@
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
                 minimumResultsForSearch: 0,
                 minimumInputLength: 0,
-                zIndex: 2000,
                 id: function (e) { return e.id; },
                 matcher: function(term, text) {
                     return text.toUpperCase().indexOf(term.toUpperCase()) >= 0;
@@ -650,13 +649,15 @@
             var offset = this.container.offset();
             var height = this.container.outerHeight();
             var width  = this.container.outerWidth();
-
-            this.dropdown.css({
+            var css    = {
                 top: offset.top + height,
                 left: offset.left,
-                width: width,
-                "z-index": this.opts.zIndex
-            });
+                width: width
+            }
+            if (this.opts.dropdownZIndex !== undefined) {
+                css["z-index"] = this.opts.dropdownZIndex
+            }
+            this.dropdown.css(css);
         },
 
         open: function () {

From 16c868934d24d52b244c77093e300171db3be1f7 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Jun 2012 09:39:23 -0700
Subject: [PATCH 14/55] minor cosmetic cleanup

---
 select2.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/select2.js b/select2.js
index 5db1190d..008a643e 100755
--- a/select2.js
+++ b/select2.js
@@ -268,15 +268,15 @@
      * the text.
      */
     function local(options) {
-        var data = options, // data elements,
-            dataText = '',
+        var data = options, // data elements
+            dataText,
             text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
 
         if (!$.isArray(data)) {
             text = data.text;
             // if text is not a function we assume it to be a key name
             if (!$.isFunction(text)) {
-              dataText = data.text; // we need to store this in a seperate variable because in the next step data gets reset and data.text is no longer available
+              dataText = data.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
               text = function (item) { return item[dataText]; };
             }
             data = data.results;

From 1d0e9a4a5b598538e241eef0457f9185e685f53e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Jun 2012 12:16:44 -0700
Subject: [PATCH 15/55] a bit of jshint cleanup

---
 select2.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/select2.js b/select2.js
index 008a643e..837c2f69 100755
--- a/select2.js
+++ b/select2.js
@@ -67,7 +67,7 @@
         }
     };
 
-    nextUid=(function() { var counter=1; return function() { return counter++; }}());
+    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
 
     function indexOf(value, array) {
         var i = 0, l = array.length, v;
@@ -518,7 +518,7 @@
                     populate(results, 0);
 
                     children=container.children();
-                    if (children.length==0) {
+                    if (children.length===0) {
                         container.html(markup.join(""));
                     } else {
                         $(children[children.length-1]).append(markup.join(""));
@@ -659,7 +659,7 @@
                 width: width
             }
             if (this.opts.dropdownZIndex !== undefined) {
-                css["z-index"] = this.opts.dropdownZIndex
+                css["z-index"] = this.opts.dropdownZIndex;
             }
             this.dropdown.css(css);
         },
@@ -1038,7 +1038,7 @@
                     killEvent(e);
                 }
             }));
-            containers.delegate(selector, "focus", function () { if (this.enabled) { containerGroup.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
+            containers.delegate(selector, "focus", function () { if (this.enabled) { containers.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
             containers.delegate(selector, "blur", this.bind(function () {
                 if (clickingInside) return;
                 if (!this.opened()) this.blur();
@@ -1350,9 +1350,7 @@
         clearSearch: function () {
             var placeholder = this.getPlaceholder();
 
-            if (placeholder !== undefined
-                && this.getVal().length === 0
-                && this.search.hasClass("select2-focused") === false) {
+            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
 
                 this.search.val(placeholder).addClass("select2-default");
                 // stretch the search box to full width of the container so as much of the placeholder is visible as possible

From dc211c486356dcd98e139ac98771d874d601c96c Mon Sep 17 00:00:00 2001
From: Rogerio Medeiros <argerim@gmail.com>
Date: Thu, 14 Jun 2012 22:08:49 -0300
Subject: [PATCH 16/55] reference about gem use in rails.

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 3b61cad5..e1215d07 100755
--- a/README.md
+++ b/README.md
@@ -27,6 +27,11 @@ Browser Compatibility
 * Safari 3+
 * Opera 10.6+
 
+Ruby on Rails
+-------------
+
+See gem [select2-rails](https://github.com/argerim/select2-rails)
+
 Bug tracker
 -----------
 

From b12e6b42e9da661b23578d091c267b9bb84250a3 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Jun 2012 20:27:10 -0700
Subject: [PATCH 17/55] Update master

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e1215d07..e76150fd 100755
--- a/README.md
+++ b/README.md
@@ -27,10 +27,11 @@ Browser Compatibility
 * Safari 3+
 * Opera 10.6+
 
-Ruby on Rails
--------------
+Integrations
+------------
 
-See gem [select2-rails](https://github.com/argerim/select2-rails)
+* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
+* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
 
 Bug tracker
 -----------

From 800b7bbb3f00c0d9f97506ec016c55be46f7f3a5 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 14 Jun 2012 20:36:22 -0700
Subject: [PATCH 18/55] dont bubble up ESC keypress. fixes #118

---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 837c2f69..59e88a18 100755
--- a/select2.js
+++ b/select2.js
@@ -1006,7 +1006,7 @@
                     return;
                 case KEY.ESC:
                     this.cancel(e);
-                    e.preventDefault();
+                    killEvent(e);
                     return;
                 }
             }));
@@ -1276,7 +1276,7 @@
                         return;
                     case KEY.ESC:
                         this.cancel(e);
-                        e.preventDefault();
+                        killEvent(e);
                         return;
                     }
                 }

From 43d990c31986094d74ec50de5ec5be18c4d14d88 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Fri, 15 Jun 2012 08:29:47 -0700
Subject: [PATCH 19/55] attach the dropdown to the element's body instead of
 the current body. issue #126

---
 select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index 59e88a18..da9f48bc 100755
--- a/select2.js
+++ b/select2.js
@@ -668,7 +668,7 @@
             if (this.opened()) return;
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-            this.dropdown.detach().appendTo('body').addClass("select2-drop-active");
+            this.dropdown.detach().appendTo(this.opts.element.parents("body")).addClass("select2-drop-active");
 
             this.positionDropdown();
 

From 151c3fd2f6827a4edc6c123a27ea1e01092734d5 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 21:08:47 +0300
Subject: [PATCH 20/55] Stick mousemove event to element' context

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/select2.js b/select2.js
index da9f48bc..8da94b9c 100755
--- a/select2.js
+++ b/select2.js
@@ -139,13 +139,14 @@
      *
      * filters out mouse events that occur when mouse is stationary but
      * the elements under the pointer are scrolled.
-     */
-    $(document).delegate("*", "mousemove", function (e) {
-        $(document).data("select2-lastpos", {x: e.pageX, y: e.pageY});
-    });
+     */    
     function installFilteredMouseMove(element) {
+    		var context = $(element[0].document);
+    		context.on("mousemove", function (e) {
+		        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
+		    });
         element.bind("mousemove", function (e) {
-            var lastpos = $(document).data("select2-lastpos");
+            var lastpos = context.data("select2-lastpos");
             if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
                 $(e.target).trigger("mousemove-filtered", e);
             }

From 68726643acf8eaa7f5d1212a0e656447aa867c70 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 21:11:38 +0300
Subject: [PATCH 21/55] Save data values to correct context

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index 8da94b9c..134963c1 100755
--- a/select2.js
+++ b/select2.js
@@ -526,7 +526,7 @@
                     }
 
                     for (uid in uidToData) {
-                        $("#select2-result-"+uid).data("select2-data", uidToData[uid]);
+                        $("#select2-result-"+uid, container).data("select2-data", uidToData[uid]);
                     }
 
                 },

From 0ff41ca512a5e4f97bae0ef386f5b81addf2c639 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 22:00:09 +0300
Subject: [PATCH 22/55] Performance optimizations

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 75 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/select2.js b/select2.js
index 134963c1..36f0f922 100755
--- a/select2.js
+++ b/select2.js
@@ -12,6 +12,26 @@
  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and limitations under the License.
  */
+ (function ($) {
+ 	if(typeof $.fn.each2 == "undefined"){
+ 		$.fn.extend({
+ 			/*
+			* 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 */
@@ -182,18 +202,19 @@
     }
 
     function measureTextWidth(e) {
-        var sizer, width;
+        var sizer, width,
+        	style = e.currentStyle || window.getComputedStyle(e, null);
         sizer = $("<div></div>").css({
             position: "absolute",
             left: "-1000px",
             top: "-1000px",
             display: "none",
-            fontSize: e.css("fontSize"),
-            fontFamily: e.css("fontFamily"),
-            fontStyle: e.css("fontStyle"),
-            fontWeight: e.css("fontWeight"),
-            letterSpacing: e.css("letterSpacing"),
-            textTransform: e.css("textTransform"),
+            fontSize: style.fontSize,
+            fontFamily: style.fontFamily,
+            fontStyle: style.fontStyle,
+            fontWeight: style.fontWeight,
+            letterSpacing: style.letterSpacing,
+            textTransform: style.textTransform,
             whiteSpace: "nowrap"
         });
         sizer.text(e.val());
@@ -534,11 +555,7 @@
                      return result.text;
                 },
                 formatSelection: function (data) {
-                    if (data.fullText) {
-                        return data.fullText;
-                    } else {
-                        return data.text;
-                    }
+                    return data.fullText || data.text;
                 },
                 formatNoMatches: function () { return "No matches found"; },
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
@@ -569,14 +586,14 @@
                             }
                         } else if (element.is("optgroup")) {
                             group={text:element.attr("label"), children:[]};
-                            element.children().each(function() { process($(this), group.children); });
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
                             if (group.children.length>0) {
                                 collection.push(group);
                             }
                         }
                     };
 
-                    element.children().each(function() { process($(this), data.results); });
+                    element.children().each2(function(i, elm) { process(elm, data.results); });
 
                     query.callback(data);
                 });
@@ -694,11 +711,12 @@
 
         ensureHighlightVisible: function () {
             var results = this.results, children, index, child, hb, rb, y, more;
-
-            children = results.find(".select2-result");
+            
             index = this.highlight();
 
             if (index < 0) return;
+            
+            children = results.find(".select2-result");
 
             child = $(children[index]);
 
@@ -760,9 +778,9 @@
         },
 
         highlightUnderEvent: function (event) {
-            var el = $(event.target).closest(".select2-result");
-            var choices = this.results.find('.select2-result');
+            var el = $(event.target).closest(".select2-result");            
             if (el.length > 0) {
+            		var choices = this.results.find('.select2-result');
                 this.highlight(choices.index(el));
             }
         },
@@ -786,7 +804,6 @@
                         context: this.context,
                         matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
-                            console.log("load more callback", data);
 
                     self.opts.populateResults(results, data.results);
 
@@ -1113,8 +1130,8 @@
 
             // find the selected element in the result list
 
-            this.results.find(".select2-result").each(function (i) {
-                if (equal(self.id($(this).data("select2-data")), self.opts.element.val())) {
+            this.results.find(".select2-result").each2(function (i, elm) {
+                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
                     selected = i;
                     return false;
                 }
@@ -1172,8 +1189,8 @@
                 // val is an id
                 this.select
                     .val(val)
-                    .find(":selected").each(function () {
-                        data = {id: $(this).attr("value"), text: $(this).text()};
+                    .find(":selected").each2(function (i, elm) {
+                        data = {id: elm.attr("value"), text: elm.text()};
                         return false;
                     });
                 this.updateSelection(data);
@@ -1223,8 +1240,8 @@
                 // install sthe selection initializer
                 opts.initSelection = function (element) {
                     var data = [];
-                    element.find(":selected").each(function () {
-                        data.push({id: $(this).attr("value"), text: $(this).text()});
+                    element.find(":selected").each2(function (i, elm) {
+                        data.push({id: elm.attr("value"), text: elm.text()});
                     });
                     return data;
                 };
@@ -1492,8 +1509,8 @@
                 choices = this.results.find(".select2-result"),
                 self = this;
 
-            choices.each(function () {
-                var choice = $(this), id = self.id(choice.data("select2-data"));
+            choices.each2(function (i, choice) {
+                var id = self.id(choice.data("select2-data"));
                 if (indexOf(id, val) >= 0) {
                     choice.addClass("select2-disabled");
                 } else {
@@ -1501,8 +1518,8 @@
                 }
             });
 
-            choices.each(function (i) {
-                if (!$(this).hasClass("select2-disabled")) {
+            choices.each2(function (i, choice) {
+                if (!choice.hasClass("select2-disabled")) {
                     self.highlight(i);
                     return false;
                 }

From 65eb7c34043ff55112769bf485eaddb9d7868955 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 22:14:46 +0300
Subject: [PATCH 23/55] Improve performance on text measuring

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/select2.js b/select2.js
index 36f0f922..068c82c7 100755
--- a/select2.js
+++ b/select2.js
@@ -40,7 +40,7 @@
         return;
     }
 
-    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid;
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer;
 
     KEY = {
         TAB: 9,
@@ -202,26 +202,25 @@
     }
 
     function measureTextWidth(e) {
-        var sizer, width,
-        	style = e.currentStyle || window.getComputedStyle(e, null);
-        sizer = $("<div></div>").css({
-            position: "absolute",
-            left: "-1000px",
-            top: "-1000px",
-            display: "none",
-            fontSize: style.fontSize,
-            fontFamily: style.fontFamily,
-            fontStyle: style.fontStyle,
-            fontWeight: style.fontWeight,
-            letterSpacing: style.letterSpacing,
-            textTransform: style.textTransform,
-            whiteSpace: "nowrap"
-        });
-        sizer.text(e.val());
-        $("body").append(sizer);
-        width = sizer.width();
-        sizer.remove();
-        return width;
+        var style = e.currentStyle || window.getComputedStyle(e, null);
+        if (!sizer){
+        	sizer = $("<div></div>").css({
+	            position: "absolute",
+	            left: "-1000px",
+	            top: "-1000px",
+	            display: "none",
+	            fontSize: style.fontSize,
+	            fontFamily: style.fontFamily,
+	            fontStyle: style.fontStyle,
+	            fontWeight: style.fontWeight,
+	            letterSpacing: style.letterSpacing,
+	            textTransform: style.textTransform,
+	            whiteSpace: "nowrap"
+	        });        
+        	$("body").append(sizer);
+        }
+        sizer.text(e.val());        
+        return sizer.width();
     }
 
     /**
@@ -478,7 +477,7 @@
                 select2.opts.element
                     .removeData("select2")
                     .unbind(".select2")
-                    .show();
+                    .show();                
             }
         },
 

From 492dccd1a559fe821b9b00a3e4f4504e8580ad16 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 22:23:12 +0300
Subject: [PATCH 24/55] no need for style if we already have a sizer

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 068c82c7..a8dc3d10 100755
--- a/select2.js
+++ b/select2.js
@@ -201,9 +201,9 @@
         event.stopPropagation();
     }
 
-    function measureTextWidth(e) {
-        var style = e.currentStyle || window.getComputedStyle(e, null);
+    function measureTextWidth(e) {        
         if (!sizer){
+        	var style = e.currentStyle || window.getComputedStyle(e, null);
         	sizer = $("<div></div>").css({
 	            position: "absolute",
 	            left: "-1000px",

From 9497693b64cd45963a9316464dd9f194b60cb556 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sat, 16 Jun 2012 23:30:22 +0300
Subject: [PATCH 25/55] style detection for search field sizer corrected

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index a8dc3d10..fb902c74 100755
--- a/select2.js
+++ b/select2.js
@@ -203,7 +203,7 @@
 
     function measureTextWidth(e) {        
         if (!sizer){
-        	var style = e.currentStyle || window.getComputedStyle(e, null);
+        	var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
         	sizer = $("<div></div>").css({
 	            position: "absolute",
 	            left: "-1000px",

From 64b69425b023dffba3c50e452530e02da67b1139 Mon Sep 17 00:00:00 2001
From: creage <creage@gmail.com>
Date: Sun, 17 Jun 2012 00:31:24 +0300
Subject: [PATCH 26/55] Reduce search field focusing, improving performance

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>
---
 select2.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/select2.js b/select2.js
index fb902c74..e41995e9 100755
--- a/select2.js
+++ b/select2.js
@@ -161,10 +161,10 @@
      * the elements under the pointer are scrolled.
      */    
     function installFilteredMouseMove(element) {
-    		var context = $(element[0].document);
-    		context.on("mousemove", function (e) {
-		        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
-		    });
+		var context = $(element[0].document);
+		context.on("mousemove", function (e) {
+	        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
+	    });
         element.bind("mousemove", function (e) {
             var lastpos = context.data("select2-lastpos");
             if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
@@ -422,8 +422,8 @@
             // initialize the container
             this.initContainer();
 
-            installFilteredMouseMove(this.results);
-            this.dropdown.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
+            //installFilteredMouseMove(this.results);
+            this.dropdown.delegate(resultsSelector, "mouseover", this.bind(this.highlightUnderEvent));
 
             installDebouncedScroll(80, this.results);
             this.dropdown.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));
@@ -773,13 +773,13 @@
             $(choices[index]).addClass("select2-highlighted");
             this.ensureHighlightVisible();
 
-            if (this.opened()) this.focusSearch();
+            //if (this.opened()) this.focusSearch();
         },
 
         highlightUnderEvent: function (event) {
             var el = $(event.target).closest(".select2-result");            
             if (el.length > 0) {
-            		var choices = this.results.find('.select2-result');
+        		var choices = this.results.find('.select2-result');
                 this.highlight(choices.index(el));
             }
         },

From 93f5e7508f51b7c4912348fe0031d6ca56393a91 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Sun, 17 Jun 2012 00:13:39 -0700
Subject: [PATCH 27/55] remove unused code

---
 select2.js | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/select2.js b/select2.js
index e41995e9..fe8352d6 100755
--- a/select2.js
+++ b/select2.js
@@ -154,26 +154,7 @@
         });
     }
 
-    /**
-     * filters mouse events so an event is fired only if the mouse moved.
-     *
-     * filters out mouse events that occur when mouse is stationary but
-     * the elements under the pointer are scrolled.
-     */    
-    function installFilteredMouseMove(element) {
-		var context = $(element[0].document);
-		context.on("mousemove", function (e) {
-	        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
-	    });
-        element.bind("mousemove", function (e) {
-            var lastpos = context.data("select2-lastpos");
-            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
-                $(e.target).trigger("mousemove-filtered", e);
-            }
-        });
-    }
-
-    /**
+     /**
      * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
      * within the last quietMillis milliseconds.
      *
@@ -422,7 +403,6 @@
             // initialize the container
             this.initContainer();
 
-            //installFilteredMouseMove(this.results);
             this.dropdown.delegate(resultsSelector, "mouseover", this.bind(this.highlightUnderEvent));
 
             installDebouncedScroll(80, this.results);

From aba23fc3e7ada52e8c88aaf7b0dd80cdadc9338c Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Sun, 17 Jun 2012 00:28:18 -0700
Subject: [PATCH 28/55] Revert "remove unused code"

This reverts commit 93f5e7508f51b7c4912348fe0031d6ca56393a91.
---
 select2.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index fe8352d6..e41995e9 100755
--- a/select2.js
+++ b/select2.js
@@ -154,7 +154,26 @@
         });
     }
 
-     /**
+    /**
+     * filters mouse events so an event is fired only if the mouse moved.
+     *
+     * filters out mouse events that occur when mouse is stationary but
+     * the elements under the pointer are scrolled.
+     */    
+    function installFilteredMouseMove(element) {
+		var context = $(element[0].document);
+		context.on("mousemove", function (e) {
+	        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
+	    });
+        element.bind("mousemove", function (e) {
+            var lastpos = context.data("select2-lastpos");
+            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
+                $(e.target).trigger("mousemove-filtered", e);
+            }
+        });
+    }
+
+    /**
      * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
      * within the last quietMillis milliseconds.
      *
@@ -403,6 +422,7 @@
             // initialize the container
             this.initContainer();
 
+            //installFilteredMouseMove(this.results);
             this.dropdown.delegate(resultsSelector, "mouseover", this.bind(this.highlightUnderEvent));
 
             installDebouncedScroll(80, this.results);

From b825d8ec41c46f650395179135518d0e8ef0246f Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Sun, 17 Jun 2012 00:45:44 -0700
Subject: [PATCH 29/55] restore smooth scrolling by fixing mouseevent-filtered

---
 select2.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/select2.js b/select2.js
index e41995e9..127a7012 100755
--- a/select2.js
+++ b/select2.js
@@ -154,6 +154,10 @@
         });
     }
 
+    $(document).delegate("*", "mousemove", function (e) {
+        $(document).data("select2-lastpos", {x: e.pageX, y: e.pageY});
+    });
+
     /**
      * filters mouse events so an event is fired only if the mouse moved.
      *
@@ -161,12 +165,8 @@
      * the elements under the pointer are scrolled.
      */    
     function installFilteredMouseMove(element) {
-		var context = $(element[0].document);
-		context.on("mousemove", function (e) {
-	        context.data("select2-lastpos", {x: e.pageX, y: e.pageY});
-	    });
-        element.bind("mousemove", function (e) {
-            var lastpos = context.data("select2-lastpos");
+	    element.bind("mousemove", function (e) {
+            var lastpos = $(document).data("select2-lastpos");
             if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
                 $(e.target).trigger("mousemove-filtered", e);
             }
@@ -422,8 +422,8 @@
             // initialize the container
             this.initContainer();
 
-            //installFilteredMouseMove(this.results);
-            this.dropdown.delegate(resultsSelector, "mouseover", this.bind(this.highlightUnderEvent));
+            installFilteredMouseMove(this.results);
+            this.dropdown.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
 
             installDebouncedScroll(80, this.results);
             this.dropdown.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));

From 437be2d6320cf2d2b4e2b399f0f213223839fba5 Mon Sep 17 00:00:00 2001
From: Ben Walding <ben@walding.com>
Date: Mon, 18 Jun 2012 14:08:16 +1000
Subject: [PATCH 30/55] Use consistent CSS for image URLs

---
 select2.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.css b/select2.css
index 1a7188a5..191ec067 100755
--- a/select2.css
+++ b/select2.css
@@ -72,7 +72,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
   width: 12px;
   height: 12px;
   font-size: 1px;
-  background: url(select2.png) right top no-repeat;
+  background: url('select2.png') right top no-repeat;
   cursor: pointer;
   text-decoration: none;
   border:0;
@@ -428,7 +428,7 @@ disabled look for already selected choices in the results dropdown
   width: 12px;
   height: 13px;
   font-size: 1px;
-  background: url(select2.png) right top no-repeat;
+  background: url('select2.png') right top no-repeat;
   outline: none;
 }
 

From 76843719236a7d3a701906dd80fe9d2785e2e8bf Mon Sep 17 00:00:00 2001
From: Aziz Gazanchiyan <creage@gmail.com>
Date: Sun, 17 Jun 2012 15:19:27 +0300
Subject: [PATCH 31/55] Improve resizeSearch() performance

Signed-off-by: Igor Vaynberg <igor.vaynberg@github.com>
---
 select2.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/select2.js b/select2.js
index 127a7012..7921aa90 100755
--- a/select2.js
+++ b/select2.js
@@ -1528,7 +1528,8 @@
 
         resizeSearch: function () {
 
-            var minimumWidth, left, maxWidth, containerLeft, searchWidth;
+            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
+            	sideBorderPadding = getSideBorderPadding(this.search);
 
             minimumWidth = measureTextWidth(this.search) + 10;
 
@@ -1537,14 +1538,14 @@
             maxWidth = this.selection.width();
             containerLeft = this.selection.offset().left;
 
-            searchWidth = maxWidth - (left - containerLeft) - getSideBorderPadding(this.search);
+            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
 
             if (searchWidth < minimumWidth) {
-                searchWidth = maxWidth - getSideBorderPadding(this.search);
+                searchWidth = maxWidth - sideBorderPadding;
             }
 
             if (searchWidth < 40) {
-                searchWidth = maxWidth - getSideBorderPadding(this.search);
+                searchWidth = maxWidth - sideBorderPadding;
             }
             this.search.width(searchWidth);
         },

From a0f067c2b20708630a54730b44d4dcca0d687459 Mon Sep 17 00:00:00 2001
From: Aziz Gazanchiyan <creage@gmail.com>
Date: Sun, 17 Jun 2012 15:38:00 +0300
Subject: [PATCH 32/55] Clear placeholder before opening dropdown, fixes #129

Signed-off-by: Igor Vaynberg <igor.vaynberg@github.com>
---
 select2.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/select2.js b/select2.js
index 7921aa90..c73534f5 100755
--- a/select2.js
+++ b/select2.js
@@ -683,6 +683,7 @@
 
         open: function () {
             if (this.opened()) return;
+            this.clearPlaceholder();
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
             this.dropdown.detach().appendTo(this.opts.element.parents("body")).addClass("select2-drop-active");

From 693b54136126427e3152b383255dd76b69653b48 Mon Sep 17 00:00:00 2001
From: Aziz Gazanchiyan <creage@gmail.com>
Date: Sun, 17 Jun 2012 16:47:56 +0300
Subject: [PATCH 33/55] Improve performance on dropdown detaching

Signed-off-by: Igor Vaynberg <igor.vaynberg@github.com>
---
 select2.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index c73534f5..a76836a7 100755
--- a/select2.js
+++ b/select2.js
@@ -483,6 +483,8 @@
 
         prepareOpts: function (opts) {
             var element, select, idKey;
+            
+            opts.elementBody = opts.element.closest("body"); // cache for future access
 
             element = opts.element;
 
@@ -686,7 +688,11 @@
             this.clearPlaceholder();
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-            this.dropdown.detach().appendTo(this.opts.element.parents("body")).addClass("select2-drop-active");
+            if(this.dropdown[0] !== this.opts.elementBody.children().last()[0]) { // ensure our dropdown is the last eleemnt, so the z-index is always respected correctly
+                this.dropdown.detach().appendTo(this.opts.elementBody);
+            }
+	
+            this.dropdown.addClass("select2-drop-active");
 
             this.positionDropdown();
 

From 9bf38c833c2fc0868b90003b56fa0924108375dc Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 20:18:51 -0700
Subject: [PATCH 34/55] renamed opts.elementBody to this.body for brevity

---
 select2.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/select2.js b/select2.js
index a76836a7..b34e1b06 100755
--- a/select2.js
+++ b/select2.js
@@ -398,7 +398,9 @@
 
             this.enabled=true;
             this.container = this.createContainer();
+			this.body = opts.element.closest("body"); // cache for future access
 
+            
             if (opts.element.attr("class") !== undefined) {
                 this.container.addClass(opts.element.attr("class"));
             }
@@ -484,8 +486,6 @@
         prepareOpts: function (opts) {
             var element, select, idKey;
             
-            opts.elementBody = opts.element.closest("body"); // cache for future access
-
             element = opts.element;
 
             if (element.get(0).tagName.toLowerCase() === "select") {
@@ -688,8 +688,9 @@
             this.clearPlaceholder();
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-            if(this.dropdown[0] !== this.opts.elementBody.children().last()[0]) { // ensure our dropdown is the last eleemnt, so the z-index is always respected correctly
-                this.dropdown.detach().appendTo(this.opts.elementBody);
+            if(this.dropdown[0] !== this.body.children().last()[0]) { 
+				// ensure the dropdown is the last child of body, so the z-index is always respected correctly
+                this.dropdown.detach().appendTo(this.body);
             }
 	
             this.dropdown.addClass("select2-drop-active");

From b2314bcb862d02c47dad4ebc708ef684a3d8b6a3 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 20:21:36 -0700
Subject: [PATCH 35/55] fix the fix for #129

---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index b34e1b06..56c42c3a 100755
--- a/select2.js
+++ b/select2.js
@@ -685,7 +685,6 @@
 
         open: function () {
             if (this.opened()) return;
-            this.clearPlaceholder();
 
             this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
             if(this.dropdown[0] !== this.body.children().last()[0]) { 
@@ -1394,7 +1393,8 @@
         open: function () {
             if (this.opened()) return;
             this.parent.open.apply(this, arguments);
-            this.resizeSearch();
+			this.clearPlaceholder();
+			this.resizeSearch();
             this.focusSearch();
         },
 

From 1e2881d5d1628d48d821aa7aef6f292a903dc198 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 20:44:26 -0700
Subject: [PATCH 36/55] a small optimization to how many times highlight is
 called

---
 select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index 56c42c3a..be95a904 100755
--- a/select2.js
+++ b/select2.js
@@ -785,7 +785,7 @@
 
         highlightUnderEvent: function (event) {
             var el = $(event.target).closest(".select2-result");            
-            if (el.length > 0) {
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
         		var choices = this.results.find('.select2-result');
                 this.highlight(choices.index(el));
             }

From 663ba1215f2a4bd96fd8331b4342720da04c8d5e Mon Sep 17 00:00:00 2001
From: Aziz Gazanchiyan <creage@gmail.com>
Date: Mon, 18 Jun 2012 18:08:48 +0300
Subject: [PATCH 37/55] Loading next page message formatting implemented, so it
 could also have localization

Signed-off-by: Igor Vaynberg <igor.vaynberg@github.com>
---
 select2.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index be95a904..9d167580 100755
--- a/select2.js
+++ b/select2.js
@@ -560,6 +560,7 @@
                 },
                 formatNoMatches: function () { return "No matches found"; },
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
+                formatLoadingNextSet: function (pageNumber) { return "Loading more results..."; },
                 minimumResultsForSearch: 0,
                 minimumInputLength: 0,
                 id: function (e) { return e.id; },
@@ -888,7 +889,7 @@
                 postRender();
 
                 if (data.more === true) {
-                    results.children().filter(":last").append("<li class='select2-more-results'>Loading more results...</li>");
+                    results.children().filter(":last").append("<li class='select2-more-results'>" + opts.formatLoadingNextSet(this.resultsPage) + "</li>");
                 }
 
                 this.postprocessResults(data, initial);

From af964bdbadfb3961fd9ee5e6e45b4480bdb48fc7 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 20:48:52 -0700
Subject: [PATCH 38/55] shorten function name for loadingMore()

---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 9d167580..6b74664c 100755
--- a/select2.js
+++ b/select2.js
@@ -560,7 +560,7 @@
                 },
                 formatNoMatches: function () { return "No matches found"; },
                 formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
-                formatLoadingNextSet: function (pageNumber) { return "Loading more results..."; },
+                formatLoadMore: function (pageNumber) { return "Loading more results..."; },
                 minimumResultsForSearch: 0,
                 minimumInputLength: 0,
                 id: function (e) { return e.id; },
@@ -889,7 +889,7 @@
                 postRender();
 
                 if (data.more === true) {
-                    results.children().filter(":last").append("<li class='select2-more-results'>" + opts.formatLoadingNextSet(this.resultsPage) + "</li>");
+                    results.children().filter(":last").append("<li class='select2-more-results'>" + opts.formatLoadMore(this.resultsPage) + "</li>");
                 }
 
                 this.postprocessResults(data, initial);

From 09f24fdda1213bdd5b3d84394fe86910d01c3849 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 22:10:33 -0700
Subject: [PATCH 39/55] add new options.type parameter for ajax helper. fixes
 #139

---
 select2.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/select2.js b/select2.js
index 6b74664c..730bdf84 100755
--- a/select2.js
+++ b/select2.js
@@ -250,17 +250,18 @@
                 requestSequence += 1; // increment the sequence
                 var requestNumber = requestSequence, // this request's sequence number
                     data = options.data, // ajax data function
-                    transport = options.transport || $.ajax;
-
+                    transport = options.transport || $.ajax,
+                    type = options.type || 'GET'; // set type of request (GET or POST)
+                
                 data = data.call(this, query.term, query.page, query.context);
 
-                if( null !== handler){
-                    handler.abort();
-                }
+                if( null !== handler) { handler.abort(); }
+                
                 handler = transport.call(null, {
                     url: options.url,
                     dataType: options.dataType,
                     data: data,
+                    type: type,
                     success: function (data) {
                         if (requestNumber < requestSequence) {
                             return;

From b7c952a1a3c3be9359676a96c62592fa9bc87e47 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 23:16:45 -0700
Subject: [PATCH 40/55] ignore first empty option in selects when a placeholder
 is set

---
 select2.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 730bdf84..e2de40f3 100755
--- a/select2.js
+++ b/select2.js
@@ -579,7 +579,7 @@
                 opts.query = this.bind(function (query) {
                     var data = { results: [], more: false },
                         term = query.term,
-                        process;
+                        children, firstChild, process;
 
                     process=function(element, collection) {
                         var group;
@@ -596,7 +596,17 @@
                         }
                     };
 
-                    element.children().each2(function(i, elm) { process(elm, data.results); });
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        firstChild = children[0];
+                        if ($(firstChild).text() === "") {
+                            children=children.not(firstChild);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
 
                     query.callback(data);
                 });

From 8b566bf6ce85dce705dc9087db20f43141210f6e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 23:34:54 -0700
Subject: [PATCH 41/55] fix hiding of search when minimumResultsForSearch are
 used. fixes #138

---
 select2.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index e2de40f3..b25b4dfc 100755
--- a/select2.js
+++ b/select2.js
@@ -1162,11 +1162,13 @@
             // hide the search box if this is the first we got the results and there are a few of them
 
             if (initial === true) {
+                // TODO below we use data.results.length, but what we really need is something recursive to calc the length
+                // TODO in case there are optgroups
                 showSearchInput = this.showSearchInput = data.results.length >= this.opts.minimumResultsForSearch;
-                this.container.find(".select2-search")[showSearchInput ? "removeClass" : "addClass"]("select2-search-hidden");
+                this.dropdown.find(".select2-search")[showSearchInput ? "removeClass" : "addClass"]("select2-search-hidden");
 
                 //add "select2-with-searchbox" to the container if search box is shown
-                this.container[showSearchInput ? "addClass" : "removeClass"]("select2-with-searchbox");
+                $(this.dropdown, this.container)[showSearchInput ? "addClass" : "removeClass"]("select2-with-searchbox");
             }
 
         },

From f9f3d6f4f3d74594540d3670d0d95b59146f7c76 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Mon, 18 Jun 2012 23:46:58 -0700
Subject: [PATCH 42/55] add ability to pragmatically specify some css. fixes
 #121

---
 select2.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/select2.js b/select2.js
index b25b4dfc..b5caa46c 100755
--- a/select2.js
+++ b/select2.js
@@ -401,11 +401,12 @@
             this.container = this.createContainer();
 			this.body = opts.element.closest("body"); // cache for future access
 
-            
             if (opts.element.attr("class") !== undefined) {
                 this.container.addClass(opts.element.attr("class"));
             }
 
+            this.container.css(opts.containerCss);
+
             // swap container for the element
             this.opts.element
                 .data("select2", this)
@@ -414,6 +415,7 @@
             this.container.data("select2", this);
 
             this.dropdown = this.container.find(".select2-drop");
+            this.dropdown.css(opts.dropdownCss);
             this.dropdown.data("select2", this);
 
             this.results = results = this.container.find(resultsSelector);
@@ -503,6 +505,8 @@
             }
 
             opts = $.extend({}, {
+                containerCss: {},
+                dropdownCss: {},
                 populateResults: function(container, results) {
                     var uidToData={}, populate, markup=[], uid, data, result, children;
 
@@ -689,9 +693,6 @@
                 left: offset.left,
                 width: width
             }
-            if (this.opts.dropdownZIndex !== undefined) {
-                css["z-index"] = this.opts.dropdownZIndex;
-            }
             this.dropdown.css(css);
         },
 

From 8f6513969e3644585e52891deed44950caa5bd5f Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Tue, 19 Jun 2012 21:31:56 -0700
Subject: [PATCH 43/55] when using default formatResult the matching substring
 is now wrapped in span with class select2-match. fixes issue #137

---
 select2.css |  2 ++
 select2.js  | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/select2.css b/select2.css
index 191ec067..3cc82545 100755
--- a/select2.css
+++ b/select2.css
@@ -464,3 +464,5 @@ disabled look for already selected choices in the results dropdown
     display: none;
 }
 /* end multiselect */
+
+.select2-match { text-decoration: underline; }
\ No newline at end of file
diff --git a/select2.js b/select2.js
index b5caa46c..4c7c6c10 100755
--- a/select2.js
+++ b/select2.js
@@ -223,6 +223,22 @@
         return sizer.width();
     }
 
+    function markMatch(text, term, markup) {
+        var match=text.toUpperCase().indexOf(term.toUpperCase()),
+            tl=term.length;
+
+        if (match<0) {
+            markup.push(text);
+            return;
+        }
+
+        markup.push(text.substring(0, match));
+        markup.push("<span class='select2-match'>");
+        markup.push(text.substring(match, match + tl));
+        markup.push("</span>");
+        markup.push(text.substring(match + tl, text.length));
+    }
+
     /**
      * Produces an ajax-based query function
      *
@@ -507,8 +523,8 @@
             opts = $.extend({}, {
                 containerCss: {},
                 dropdownCss: {},
-                populateResults: function(container, results) {
-                    var uidToData={}, populate, markup=[], uid, data, result, children;
+                populateResults: function(container, results, query) {
+                    var uidToData={}, populate, markup=[], uid, data, result, children, formatted;
 
                     populate=function(results, depth) {
 
@@ -531,7 +547,13 @@
                                 uidToData[uid]=result;
                             }
 
-                            markup.push("><div class='select2-result-label'>"+opts.formatResult(result)+"</div>");
+                            markup.push("><div class='select2-result-label'>");
+                            formatted=opts.formatResult(result, query, markup);
+                            // for backwards compat with <3.0 versions
+                            if (formatted!==undefined) {
+                                markup.push(formatted);
+                            }
+                            markup.push("</div>");
 
                             if (compound) {
                                 markup.push("<ul class='select2-result-sub'>");
@@ -557,8 +579,8 @@
                     }
 
                 },
-                formatResult: function(result) {
-                     return result.text;
+                formatResult: function(result, query, markup) {
+                    markMatch(result.text, query.term, markup);
                 },
                 formatSelection: function (data) {
                     return data.fullText || data.text;
@@ -824,7 +846,7 @@
                         matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
 
-                    self.opts.populateResults(results, data.results);
+                    self.opts.populateResults(results, data.results, {term: term, page: page, context:context});
 
                     if (data.more===true) {
                         more.detach();
@@ -897,7 +919,7 @@
                 }
 
                 results.empty();
-                self.opts.populateResults(results, data.results);
+                self.opts.populateResults(results, data.results, {term: search.val(), page: this.resultsPage, context:null});
                 postRender();
 
                 if (data.more === true) {
@@ -1706,7 +1728,8 @@
             local: local,
             tags: tags
         }, util: {
-            debounce: debounce
+            debounce: debounce,
+            markMatch: markMatch
         }, "class": {
             "abstract": AbstractSelect2,
             "single": SingleSelect2,

From 2343572a251ae35665c487c93a92f83210d29fdf Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Tue, 19 Jun 2012 22:09:37 -0700
Subject: [PATCH 44/55] add spinner to search field in multiselect. fixes #130

---
 select2.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/select2.css b/select2.css
index 3cc82545..0544120d 100755
--- a/select2.css
+++ b/select2.css
@@ -382,6 +382,9 @@ disabled look for already selected choices in the results dropdown
   box-shadow        : none;
 }
 
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100% !important;
+}
 
 .select2-default {
   color: #999 !important;

From 4819d42f85abd7fe7ab3d87468849b9b450a2d74 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Wed, 20 Jun 2012 17:28:26 -0700
Subject: [PATCH 45/55] no longer need to blur in a settimeout because dropdown
 and searchfield are now detached. possibly fixes #132

---
 select2.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/select2.js b/select2.js
index 4c7c6c10..5160bf19 100755
--- a/select2.js
+++ b/select2.js
@@ -935,16 +935,11 @@
         },
 
         blur: function () {
-            /* we do this in a timeout so that current event processing can complete before this code is executed.
-             this allows tab index to be preserved even if this code blurs the textfield */
-            window.setTimeout(this.bind(function () {
-                this.close();
-                this.container.removeClass("select2-container-active");
-                this.dropdown.removeClass("select2-drop-active");
-                this.clearSearch();
-                this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-                this.search.blur();
-            }), 10);
+            this.close();
+            this.container.removeClass("select2-container-active");
+            this.dropdown.removeClass("select2-drop-active");
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
         },
 
         focusSearch: function () {

From 84f031f4b01489b9573c8a0f421273c25b64d703 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 19:00:29 -0700
Subject: [PATCH 46/55] code navigation 'helpers'

---
 select2.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/select2.js b/select2.js
index 5160bf19..0f85746b 100755
--- a/select2.js
+++ b/select2.js
@@ -392,6 +392,7 @@
 
     AbstractSelect2 = clazz(Object, {
 
+        // abstract
         bind: function (func) {
             var self = this;
             return function () {
@@ -399,6 +400,7 @@
             };
         },
 
+        // abstract
         init: function (opts) {
             var results, search, resultsSelector = ".select2-results";
 
@@ -490,6 +492,7 @@
             if (opts.element.is(":disabled")) this.disable();
         },
 
+        // abstract
         destroy: function () {
             var select2 = this.opts.element.data("select2");
             if (select2 !== undefined) {
@@ -502,6 +505,7 @@
             }
         },
 
+        // abstract
         prepareOpts: function (opts) {
             var element, select, idKey;
             
@@ -667,6 +671,7 @@
         /**
          * Monitor the original element for changes and update select2 accordingly
          */
+        // abstract
         monitorSource: function () {
             this.opts.element.bind("change.select2", this.bind(function (e) {
                 if (this.opts.element.data("select2-change-triggered") !== true) {
@@ -678,6 +683,7 @@
         /**
          * Triggers the change event on the source element
          */
+        // abstract
         triggerChange: function () {
             // Prevents recursive triggering
             this.opts.element.data("select2-change-triggered", true);
@@ -686,6 +692,7 @@
         },
 
 
+        // abstract
         enable: function() {
             if (this.enabled) return;
 
@@ -693,6 +700,7 @@
             this.container.removeClass("select2-container-disabled");
         },
 
+        // abstract
         disable: function() {
             if (!this.enabled) return;
 
@@ -702,10 +710,12 @@
             this.container.addClass("select2-container-disabled");
         },
 
+        // abstract
         opened: function () {
             return this.container.hasClass("select2-dropdown-open");
         },
 
+        // abstract
         positionDropdown: function() {
             var offset = this.container.offset();
             var height = this.container.outerHeight();
@@ -718,6 +728,7 @@
             this.dropdown.css(css);
         },
 
+        // abstract
         open: function () {
             if (this.opened()) return;
 
@@ -737,6 +748,7 @@
             this.focusSearch();
         },
 
+        // abstract
         close: function () {
             if (!this.opened()) return;
 
@@ -746,10 +758,12 @@
             this.clearSearch();
         },
 
+        // abstract
         clearSearch: function () {
 
         },
 
+        // abstract
         ensureHighlightVisible: function () {
             var results = this.results, children, index, child, hb, rb, y, more;
             
@@ -783,6 +797,7 @@
             }
         },
 
+        // abstract
         moveHighlight: function (delta) {
             var choices = this.results.find(".select2-result"),
                 index = this.highlight();
@@ -796,6 +811,7 @@
             }
         },
 
+        // abstract
         highlight: function (index) {
             var choices = this.results.find(".select2-result .select2-result-label");
 
@@ -818,6 +834,7 @@
             //if (this.opened()) this.focusSearch();
         },
 
+        // abstract
         highlightUnderEvent: function (event) {
             var el = $(event.target).closest(".select2-result");            
             if (el.length > 0 && !el.is(".select2-highlighted")) {
@@ -826,6 +843,7 @@
             }
         },
 
+        // abstract
         loadMoreIfNeeded: function () {
             var results = this.results,
                 more = results.find("li.select2-more-results"),
@@ -863,6 +881,7 @@
         /**
          * @param initial whether or not this is the call to this method right after the dropdown has been opened
          */
+        // abstract
         updateResults: function (initial) {
             var search = this.search, results = this.results, opts = this.opts, self=this;
 
@@ -930,10 +949,12 @@
             })});
         },
 
+        // abstract
         cancel: function () {
             this.close();
         },
 
+        // abstract
         blur: function () {
             this.close();
             this.container.removeClass("select2-container-active");
@@ -942,6 +963,7 @@
             this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
         },
 
+        // abstract
         focusSearch: function () {
             /* we do this in a timeout so that current event processing can complete before this code is executed.
              this makes sure the search field is focussed even if the current event would blur it */
@@ -950,6 +972,7 @@
             }), 10);
         },
 
+        // abstract
         selectHighlighted: function () {
             var data = this.results.find(".select2-highlighted").not(".select2-disabled").closest('.select2-result').not('.select2-result-unselectable').data("select2-data");
             if (data) {
@@ -957,6 +980,7 @@
             }
         },
 
+        // abstract
         getPlaceholder: function () {
             return this.opts.element.attr("placeholder") || this.opts.element.data("placeholder") || this.opts.placeholder;
         },
@@ -969,6 +993,7 @@
          *
          * @returns The width string (with units) for the container.
          */
+        // abstract
         getContainerWidth: function () {
             var style, attrs, matches, i, l;
             if (this.opts.width !== undefined)
@@ -990,6 +1015,7 @@
 
     SingleSelect2 = clazz(AbstractSelect2, {
 
+        // single
         createContainer: function () {
             return $("<div></div>", {
                 "class": "select2-container",
@@ -1008,6 +1034,7 @@
                 "</div>"].join(""));
         },
 
+        // single
         open: function () {
 
             if (this.opened()) return;
@@ -1016,25 +1043,30 @@
 
         },
 
+        // single
         close: function () {
             if (!this.opened()) return;
             this.parent.close.apply(this, arguments);
         },
 
+        // single
         focus: function () {
             this.close();
             this.selection.focus();
         },
 
+        // single
         isFocused: function () {
             return this.selection.is(":focus");
         },
 
+        // single
         cancel: function () {
             this.parent.cancel.apply(this, arguments);
             this.selection.focus();
         },
 
+        // single
         initContainer: function () {
 
             var selection,
@@ -1112,6 +1144,7 @@
         /**
          * Sets selection based on source element's value
          */
+        // single
         initSelection: function () {
             var selected;
             if (this.opts.element.val() === "") {
@@ -1127,6 +1160,7 @@
             this.setPlaceholder();
         },
 
+        // single
         prepareOpts: function () {
             var opts = this.parent.prepareOpts.apply(this, arguments);
 
@@ -1142,6 +1176,7 @@
             return opts;
         },
 
+        // single
         setPlaceholder: function () {
             var placeholder = this.getPlaceholder();
 
@@ -1161,6 +1196,7 @@
             }
         },
 
+        // single
         postprocessResults: function (data, initial) {
             var selected = 0, self = this, showSearchInput = true;
 
@@ -1191,6 +1227,7 @@
 
         },
 
+        // single
         onSelect: function (data) {
             var old = this.opts.element.val();
 
@@ -1202,6 +1239,7 @@
             if (!equal(old, this.id(data))) { this.triggerChange(); }
         },
 
+        // single
         updateSelection: function (data) {
             this.selection
                 .find("span")
@@ -1214,6 +1252,7 @@
             }
         },
 
+        // single
         val: function () {
             var val, data = null;
 
@@ -1241,6 +1280,7 @@
 
         },
 
+        // single
         clearSearch: function () {
             this.search.val("");
         }
@@ -1248,6 +1288,7 @@
 
     MultiSelect2 = clazz(AbstractSelect2, {
 
+        // multi
         createContainer: function () {
             return $("<div></div>", {
                 "class": "select2-container select2-container-multi",
@@ -1265,6 +1306,7 @@
                 "</div>"].join(""));
         },
 
+        // multi
         prepareOpts: function () {
             var opts = this.parent.prepareOpts.apply(this, arguments);
 
@@ -1288,6 +1330,7 @@
             return opts;
         },
 
+        // multi
         initContainer: function () {
 
             var selector = ".select2-choices", selection;
@@ -1369,6 +1412,7 @@
             this.clearSearch();
         },
 
+        // multi
         enable: function() {
             if (this.enabled) return;
 
@@ -1377,6 +1421,7 @@
             this.search.show();
         },
 
+        // multi
         disable: function() {
             if (!this.enabled) return;
 
@@ -1385,6 +1430,7 @@
             this.search.hide();
         },
 
+        // multi
         initSelection: function () {
             var data;
             if (this.opts.element.val() === "") {
@@ -1403,6 +1449,7 @@
             this.clearSearch();
         },
 
+        // multi
         clearSearch: function () {
             var placeholder = this.getPlaceholder();
 
@@ -1416,12 +1463,14 @@
             }
         },
 
+        // multi
         clearPlaceholder: function () {
             if (this.search.hasClass("select2-default")) {
                 this.search.val("").removeClass("select2-default");
             }
         },
 
+        // multi
         open: function () {
             if (this.opened()) return;
             this.parent.open.apply(this, arguments);
@@ -1430,20 +1479,24 @@
             this.focusSearch();
         },
 
+        // 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;
 
@@ -1463,6 +1516,7 @@
             self.postprocessResults();
         },
 
+        // multi
         onSelect: function (data) {
             this.addSelectedChoice(data);
             if (this.select) { this.postprocessResults(); }
@@ -1482,11 +1536,13 @@
             this.focusSearch();
         },
 
+        // multi
         cancel: function () {
             this.close();
             this.focusSearch();
         },
 
+        // multi
         addSelectedChoice: function (data) {
             var choice,
                 id = this.id(data),
@@ -1522,6 +1578,7 @@
             this.setVal(val);
         },
 
+        // multi
         unselect: function (selected) {
             var val = this.getVal(),
                 index;
@@ -1543,6 +1600,7 @@
             this.triggerChange();
         },
 
+        // multi
         postprocessResults: function () {
             var val = this.getVal(),
                 choices = this.results.find(".select2-result"),
@@ -1566,6 +1624,7 @@
 
         },
 
+        // multi
         resizeSearch: function () {
 
             var minimumWidth, left, maxWidth, containerLeft, searchWidth,
@@ -1590,6 +1649,7 @@
             this.search.width(searchWidth);
         },
 
+        // multi
         getVal: function () {
             var val;
             if (this.select) {
@@ -1601,6 +1661,7 @@
             }
         },
 
+        // multi
         setVal: function (val) {
             var unique;
             if (this.select) {
@@ -1615,6 +1676,7 @@
             }
         },
 
+        // multi
         val: function () {
             var val, data = [], self=this;
 
@@ -1642,6 +1704,8 @@
 
             this.clearSearch();
         },
+
+        // multi
         onSortStart: function() {
             if (this.select) {
                 throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
@@ -1652,6 +1716,8 @@
             // hide the container
             this.searchContainer.hide();
         },
+
+        // multi
         onSortEnd:function() {
 
             var val=[], self=this;

From e13dc416548055fe5ffd9f72c8843200f1aed08e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 19:19:19 -0700
Subject: [PATCH 47/55] fix placeholder in multiselects when blurred by
 clicking outside

---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 0f85746b..c41286a4 100755
--- a/select2.js
+++ b/select2.js
@@ -959,6 +959,7 @@
             this.close();
             this.container.removeClass("select2-container-active");
             this.dropdown.removeClass("select2-drop-active");
+            if (this.search.is(":focus")) { this.search.blur(); }
             this.clearSearch();
             this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
         },
@@ -1317,7 +1318,7 @@
             // TODO validate placeholder is a string if specified
 
             if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install sthe selection initializer
+                // install the selection initializer
                 opts.initSelection = function (element) {
                     var data = [];
                     element.find(":selected").each2(function (i, elm) {
@@ -1454,7 +1455,6 @@
             var placeholder = this.getPlaceholder();
 
             if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
-
                 this.search.val(placeholder).addClass("select2-default");
                 // stretch the search box to full width of the container so as much of the placeholder is visible as possible
                 this.search.width(this.getContainerWidth());

From 16c3d31e06308dc045cf8a4f176a7572cbe23477 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 21:18:13 -0700
Subject: [PATCH 48/55] full tabbing support for the mac. closes #132

---
 select2.css |  4 +++-
 select2.js  | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/select2.css b/select2.css
index 0544120d..859c0c39 100755
--- a/select2.css
+++ b/select2.css
@@ -468,4 +468,6 @@ disabled look for already selected choices in the results dropdown
 }
 /* end multiselect */
 
-.select2-match { text-decoration: underline; }
\ No newline at end of file
+.select2-match { text-decoration: underline; }
+
+.select2-offscreen { position: absolute; left: -1000px; }
\ No newline at end of file
diff --git a/select2.js b/select2.js
index c41286a4..43dd1781 100755
--- a/select2.js
+++ b/select2.js
@@ -1022,7 +1022,7 @@
                 "class": "select2-container",
                 "style": "width: " + this.getContainerWidth()
             }).html([
-                "    <a href='javascript:void(0)' class='select2-choice'>",
+                "    <a href='javascript:void(0)' class='select2-choice'><input type='text' class='select2-offscreen select2-focusser'/>",
                 "   <span></span><abbr class='select2-search-choice-close' style='display:none;'></abbr>",
                 "   <div><b></b></div>" ,
                 "</a>",
@@ -1075,7 +1075,8 @@
                 dropdown = this.dropdown,
                 containers = $([this.container.get(0), this.dropdown.get(0)]),
                 clickingInside = false,
-                selector = ".select2-choice";
+                selector = ".select2-choice",
+                focusser=container.find("input.select2-focusser");
 
             this.selection = selection = container.find(selector);
 
@@ -1126,9 +1127,10 @@
                 }
             }));
             containers.delegate(selector, "focus", function () { if (this.enabled) { containers.addClass("select2-container-active"); dropdown.addClass("select2-drop-active"); }});
-            containers.delegate(selector, "blur", this.bind(function () {
+            containers.delegate(selector, "blur", this.bind(function (e) {
                 if (clickingInside) return;
-                if (!this.opened()) this.blur();
+                if (e.target===focusser.get(0)) return; // ignore blurs from focusser
+                if (!this.opened()) { this.blur(); }
             }));
 
             selection.delegate("abbr", "click", this.bind(function (e) {
@@ -1137,9 +1139,18 @@
                 killEvent(e);
                 this.close();
                 this.triggerChange();
+                selection.focus();
             }));
 
             this.setPlaceholder();
+
+            focusser.bind("focus", function() { selection.focus(); });
+            selection.bind("focus", this.bind(function() {
+                focusser.hide();
+                this.container.addClass("select2-container-active");
+            }));
+            selection.bind("blur", function() { focusser.show(); });
+            this.opts.element.bind("open", function() { focusser.hide(); });
         },
 
         /**

From 54b83c2baf2265ba08ae170a45e1cc40bbea94d8 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 21:36:08 -0700
Subject: [PATCH 49/55] fix input field broken by fix to #132

---
 select2.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/select2.js b/select2.js
index 43dd1781..02d162a5 100755
--- a/select2.js
+++ b/select2.js
@@ -437,7 +437,7 @@
             this.dropdown.data("select2", this);
 
             this.results = results = this.container.find(resultsSelector);
-            this.search = search = this.container.find("input[type=text]");
+            this.search = search = this.container.find("input.select2-input");
 
             this.resultsPage = 0;
             this.context = null;
@@ -1028,7 +1028,7 @@
                 "</a>",
                 "    <div class='select2-drop' style='display:none;'>" ,
                 "   <div class='select2-search'>" ,
-                "       <input type='text' autocomplete='off'/>" ,
+                "       <input type='text' autocomplete='off' class='select2-input'/>" ,
                 "   </div>" ,
                 "   <ul class='select2-results'>" ,
                 "   </ul>" ,
@@ -1309,7 +1309,7 @@
                 "    <ul class='select2-choices'>",
                 //"<li class='select2-search-choice'><span>California</span><a href="javascript:void(0)" class="select2-search-choice-close"></a></li>" ,
                 "  <li class='select2-search-field'>" ,
-                "    <input type='text' autocomplete='off' style='width: 25px;'>" ,
+                "    <input type='text' autocomplete='off' style='width: 25px;' class='select2-input'>" ,
                 "  </li>" ,
                 "</ul>" ,
                 "<div class='select2-drop select2-drop-multi' style='display:none;'>" ,

From 0f473423ebb63b1fa966902683a1272c21ab5310 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 21:42:45 -0700
Subject: [PATCH 50/55] remove lineheight from choice label. fixes #147

---
 select2.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/select2.css b/select2.css
index 859c0c39..3f061ac5 100755
--- a/select2.css
+++ b/select2.css
@@ -259,8 +259,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 .select2-results .select2-result-label {
-  line-height: 80%;
-  padding: 7px 7px 8px;
+  padding: 3px 7px 4px;
   margin: 0;
   cursor: pointer;
 }

From e85d131f0a102d84bfb4aa1db06483d58d45813e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 22:04:35 -0700
Subject: [PATCH 51/55] add ability to programmatically specify css classes as
 well as css styles

---
 select2.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index 02d162a5..b844b3d6 100755
--- a/select2.js
+++ b/select2.js
@@ -375,6 +375,10 @@
         });
     });
 
+    function evaluate(val) {
+        return $.isFunction(val) ? val() : val;
+    }
+
     /**
      * Creates a new class
      *
@@ -423,7 +427,8 @@
                 this.container.addClass(opts.element.attr("class"));
             }
 
-            this.container.css(opts.containerCss);
+            this.container.css(evaluate(opts.containerCss));
+            this.container.addClass(evaluate(opts.containerCssClass));
 
             // swap container for the element
             this.opts.element
@@ -433,7 +438,8 @@
             this.container.data("select2", this);
 
             this.dropdown = this.container.find(".select2-drop");
-            this.dropdown.css(opts.dropdownCss);
+            this.dropdown.css(evaluate(opts.dropdownCss));
+            this.dropdown.addClass(evaluate(opts.dropdownCssClass));
             this.dropdown.data("select2", this);
 
             this.results = results = this.container.find(resultsSelector);
@@ -527,6 +533,8 @@
             opts = $.extend({}, {
                 containerCss: {},
                 dropdownCss: {},
+                containerCssClass: "",
+                dropdownCssClass: "",
                 populateResults: function(container, results, query) {
                     var uidToData={}, populate, markup=[], uid, data, result, children, formatted;
 

From 88ab9f9348109310168a71e6d3eca295ff52ef8d Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 22:08:56 -0700
Subject: [PATCH 52/55] define term and context. fixes #148

---
 select2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/select2.js b/select2.js
index b844b3d6..da5d6a1e 100755
--- a/select2.js
+++ b/select2.js
@@ -858,7 +858,9 @@
                 below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
                 offset = -1, // index of first element without data
                 page = this.resultsPage + 1,
-                self=this;
+                self=this,
+                term=this.search.val(),
+                context=this.context;
 
             if (more.length === 0) return;
             below = more.offset().top - results.offset().top - results.height();

From 050a23b53d52d73fa6f6391dcfcc5848ee9e9f2f Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 22:09:33 -0700
Subject: [PATCH 53/55] small cleanup #148

---
 select2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/select2.js b/select2.js
index da5d6a1e..1274456d 100755
--- a/select2.js
+++ b/select2.js
@@ -868,9 +868,9 @@
             if (below <= 0) {
                 more.addClass("select2-active");
                 this.opts.query({
-                        term: this.search.val(),
+                        term: term,
                         page: page,
-                        context: this.context,
+                        context: context,
                         matcher: this.opts.matcher,
                         callback: this.bind(function (data) {
 

From 7ec2dec955e7b4065777cc3278e9e95fad7ea2bf Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@github.com>
Date: Thu, 21 Jun 2012 22:56:50 -0700
Subject: [PATCH 54/55] change event now contains added/removed/val properties.
 fixes #133

---
 select2.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/select2.js b/select2.js
index 1274456d..e4905869 100755
--- a/select2.js
+++ b/select2.js
@@ -692,10 +692,13 @@
          * Triggers the change event on the source element
          */
         // abstract
-        triggerChange: function () {
-            // Prevents recursive triggering
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
             this.opts.element.data("select2-change-triggered", true);
-            this.opts.element.trigger("change");
+            this.opts.element.trigger(details);
             this.opts.element.data("select2-change-triggered", false);
         },
 
@@ -1552,7 +1555,7 @@
 
             // 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();
+            this.triggerChange({ added: data });
 
             this.focusSearch();
         },
@@ -1602,6 +1605,7 @@
         // multi
         unselect: function (selected) {
             var val = this.getVal(),
+                data,
                 index;
 
             selected = selected.closest(".select2-search-choice");
@@ -1610,7 +1614,9 @@
                 throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
             }
 
-            index = indexOf(this.id(selected.data("select2-data")), val);
+            data = selected.data("select2-data");
+
+            index = indexOf(this.id(data), val);
 
             if (index >= 0) {
                 val.splice(index, 1);
@@ -1618,7 +1624,7 @@
                 if (this.select) this.postprocessResults();
             }
             selected.remove();
-            this.triggerChange();
+            this.triggerChange({ removed: data });
         },
 
         // multi

From f0d540da37db21cffc8a6ca55571dd6140165e6a Mon Sep 17 00:00:00 2001
From: Dean Sofer <proloser@hotmail.com>
Date: Tue, 26 Jun 2012 18:16:57 -0700
Subject: [PATCH 55/55] Added a link to another integration for AngularJS

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e76150fd..b00a4f2b 100755
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Integrations
 
 * [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
 * [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
+* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
 
 Bug tracker
 -----------