From a903b5d3c1faf72e38f07f3cc5da7dd39f91aec0 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 9 Apr 2013 19:53:36 -0700
Subject: [PATCH] catch up to master

---
 select2-latest.html | 16 +++++++++++++++-
 select2-master      |  2 +-
 select2-test.html   | 32 ++++++++++++++++++--------------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/select2-latest.html b/select2-latest.html
index 16ede629..ca2f56eb 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1625,6 +1625,20 @@ $("#select").select2({
                 </p>
             </div>
         </div>
+        <div class="row zebra">
+            <div class="span12">
+                <h3>select</h3>
+                <p>Fired when a choice is being selected in the dropdown, but before any modification has been made to the selection.
+                    This event is used to allow the user to reject selection by calling <code>event.preventDefault()</code></p>
+                </p>
+                <p>The event object contains the following custom properties:
+                <dl>
+                    <dt>val</dt><dd>the id of the highlighted choice object</dd>
+                    <dt>object</dt><dd>the choice object about to be selected</dd>
+                </dl>
+                </p>
+            </div>
+        </div>
         <div class="row">
             <div class="span12">
                 <h3>selected</h3>
@@ -1633,7 +1647,7 @@ $("#select").select2({
                 <p>The event object contains the following custom properties:
                 <dl>
                     <dt>val</dt><dd>the id of the highlighted choice object</dd>
-                    <dt>object</dt><dd>the highlighted choice object</dd>
+                    <dt>object</dt><dd>the choice object that was selected</dd>
                 </dl>
                 </p>
             </div>
diff --git a/select2-master b/select2-master
index 2bf5a763..dc27a5b7 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 2bf5a763c5e884cdf0295aa0d5072968bab941e2
+Subproject commit dc27a5b74d78c1f04306caba576c27973311424b
diff --git a/select2-test.html b/select2-test.html
index 91b9ec20..8da16c31 100644
--- a/select2-test.html
+++ b/select2-test.html
@@ -59,20 +59,7 @@
        });
 </script>
 
-<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
-<script>
-    $(document).ready(function() {
-        var el=$("#focus-spy");
-        $(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
-        var update=function() {
-            var a=document.activeElement;
-            var b=$(a);
-            el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
-            window.setTimeout(update, 100);
-        };
-        update();
-    });
-</script>
+
 <script id="script_e6">
 
     function movieFormatResult(movie) {
@@ -127,5 +114,22 @@
         });
     });
 </script>
+
+
+<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
+<script>
+    $(document).ready(function() {
+        var el=$("#focus-spy");
+        $(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
+        var update=function() {
+            var a=document.activeElement;
+            var b=$(a);
+            el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
+            window.setTimeout(update, 100);
+        };
+        update();
+    });
+</script>
+
 </body>
 </html>
\ No newline at end of file