RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-03-10 22:56:12 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Igor Vaynberg 2012-05-28 15:16:23 -07:00
commit cb7f1da4e6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
select2.js
View File

@ -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;