1
0
mirror of synced 2025-03-10 22:56:12 +03:00

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

This commit is contained in:
Igor Vaynberg 2012-05-28 15:16:23 -07:00
commit cb7f1da4e6

View File

@ -352,7 +352,8 @@
this.id=opts.id;
// 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();
}
@ -544,6 +545,7 @@
this.updateResults(true);
this.dropdown.show();
this.ensureHighlightVisible();
this.focusSearch();
},
@ -1121,6 +1123,7 @@
killEvent(e);
return;
case KEY.ENTER:
case KEY.TAB:
this.selectHighlighted();
killEvent(e);
return;