From c90ad9727e970930c5378ac6d866e3c885145c02 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Fri, 8 Feb 2013 12:13:59 -0800
Subject: [PATCH] catch up to master

---
 select2-latest.html |  4 ++--
 select2-master      |  2 +-
 select2-test.html   | 23 ++++++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/select2-latest.html b/select2-latest.html
index 67a2a046..58411caa 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -5,8 +5,8 @@ group: navigation
 version: 3.4
 ---
 
-<link href="select2-master/src/select2.css" rel="stylesheet"/>
-<script src="select2-master/src/select2.js"></script>
+<link href="select2-master/select2.css" rel="stylesheet"/>
+<script src="select2-master/select2.js"></script>
 
 <script id="script_e1">
 
diff --git a/select2-master b/select2-master
index 2149da3b..d04d127c 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 2149da3b6b4eb110d7a742fd4126fbdc93ada421
+Subproject commit d04d127cabacfdaf0a89c32719a65c50c4e09f79
diff --git a/select2-test.html b/select2-test.html
index e100390d..4ddd2369 100644
--- a/select2-test.html
+++ b/select2-test.html
@@ -10,7 +10,10 @@
 <body>
 
 <div style="padding: 10px; margin: 10px;">
+    <br/><br/><br/>
+    <input type="text" size="30"/><br/>
     <select id="e4" style="width:300px" class="populate">
+            <option></option>
             <option value="AK">Alaska</option>
             <option value="HI">Hawaii</option>
             <option value="CA">California</option>
@@ -18,6 +21,7 @@
             <option value="OR">Oregon</option>
             <option value="WA">Washington</option>
     </select><br/>
+    <input type="text" size="30"/>
 </div>
    <script>
        $(document).ready(function() {
@@ -27,11 +31,28 @@
            }
            $("#e4").select2({
                formatResult: format,
-               formatSelection: format
+               formatSelection: format,
+               escapeMarkup: function(m) { return m; },
+               allowClear:true,
+               placeholder: "select a state"
            });
        });
 </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
