Browse Source

Merge branch 'master' of git://github.com/ivaynberg/select2

Igor Vaynberg 13 years ago
parent
commit
cb7f1da4e6
1 changed files with 4 additions and 1 deletions
  1. 4 1
      select2.js

+ 4 - 1
select2.js

@@ -352,7 +352,8 @@
             this.id=opts.id;
             this.id=opts.id;
 
 
             // destroy if called on an existing component
             // destroy if called on an existing component
-            if (opts.element.data("select2") !== undefined) {
+            if (opts.element.data("select2") !== undefined &&
+                opts.element.data("select2") !== null) {
                 this.destroy();
                 this.destroy();
             }
             }
 
 
@@ -544,6 +545,7 @@
 
 
             this.updateResults(true);
             this.updateResults(true);
             this.dropdown.show();
             this.dropdown.show();
+            this.ensureHighlightVisible();
             this.focusSearch();
             this.focusSearch();
         },
         },
 
 
@@ -1121,6 +1123,7 @@
                         killEvent(e);
                         killEvent(e);
                         return;
                         return;
                     case KEY.ENTER:
                     case KEY.ENTER:
+                    case KEY.TAB:
                         this.selectHighlighted();
                         this.selectHighlighted();
                         killEvent(e);
                         killEvent(e);
                         return;
                         return;