RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-04 14:19:23 +03:00
Code Issues Projects Releases Wiki Activity

Reworks search field. Fixes #239

Browse Source 
Uses the correct EOLs now, fixes iPad keyboard issue.
This commit is contained in:
Kevin Brown 2012-07-23 12:04:13 -04:00
parent 116528908a
commit c58cd12829
1 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
select2.js
View File

@ -1089,6 +1089,8 @@
this makes sure the search field is focussed even if the current event would blur it */ this makes sure the search field is focussed even if the current event would blur it */
window.setTimeout(this.bind(function () { window.setTimeout(this.bind(function () {
this.search.focus(); this.search.focus();
// reset the value so IE places the cursor at the end of the input box
this.search.val(this.search.val());
}), 10); }), 10);
}, },
@ -1203,7 +1205,7 @@
// single // single
focus: function () { focus: function () {
this.close(); this.close();
this.search.focus(); this.container.focus();
}, },
// single // single
@ -1214,7 +1216,7 @@
// single // single
cancel: function () { cancel: function () {
this.parent.cancel.apply(this, arguments); this.parent.cancel.apply(this, arguments);
this.search.focus(); this.container.focus();
}, },
// single // single
@ -1253,7 +1255,47 @@
killEvent(e); killEvent(e);
return; return;
} }
} else { }
}));
selection.bind("click", this.bind(function (e) {
clickingInside = true;
if (this.opened()) {
this.close();
this.container.focus();
} else if (this.enabled) {
this.open();
}
killEvent(e);
clickingInside = false;
}));
dropdown.bind("click", this.bind(function() { this.search.focus(); }));
container.bind("focus", this.bind(function() {
// allows the container to recieve the keyup event
this.container.attr("tabindex", 1);
}));
container.bind("blur", this.bind(function() {
// remove the tabindex so the tab key works properly
this.container.attr("tabindex", -1);
}));
container.bind("keydown", this.bind(function(e) {
if (!this.enabled) return;
this.container.attr("tabindex", -1);
if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
// prevent the page from scrolling
killEvent(e);
return;
}
if (!this.opened()) {
if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) { if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
return; return;
} }
@ -1265,32 +1307,24 @@
killEvent(e); killEvent(e);
return; return;
} }
var keyWritten = String.fromCharCode(e.which).toLowerCase();
if (e.shiftKey) {
keyWritten = keyWritten.toUpperCase();
}
this.search.val(keyWritten);
} }
})); }));
selection.bind("click", this.bind(function (e) {
clickingInside = true;
if (this.opened()) {
this.close();
this.search.focus();
} else if (this.enabled) {
this.open();
}
killEvent(e);
clickingInside = false;
}));
dropdown.bind("click", this.bind(function() { this.search.focus(); }));
selection.delegate("abbr", "click", this.bind(function (e) { selection.delegate("abbr", "click", this.bind(function (e) {
if (!this.enabled) return; if (!this.enabled) return;
this.clear(); this.clear();
killEvent(e); killEvent(e);
this.close(); this.close();
this.triggerChange(); this.triggerChange();
this.search.focus(); this.container.focus();
})); }));
selection.bind("focus", this.bind(function() { this.search.focus(); })); selection.bind("focus", this.bind(function() { this.search.focus(); }));
@ -1403,7 +1437,7 @@
this.opts.element.val(this.id(data)); this.opts.element.val(this.id(data));
this.updateSelection(data); this.updateSelection(data);
this.close(); this.close();
this.search.focus(); this.container.focus();
if (!equal(old, this.id(data))) { this.triggerChange(); } if (!equal(old, this.id(data))) { this.triggerChange(); }
}, },
@ -1697,7 +1731,7 @@
// multi // multi
focus: function () { focus: function () {
this.close(); this.close();
this.search.focus(); this.container.focus();
}, },
// multi // multi