RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-10 09:09:24 +03:00
Code Issues Projects Releases Wiki Activity

After prevented removing of item in multiselect, proper item is focused

Browse Source
This commit is contained in:
Ján Koščo 2014-03-05 11:20:07 +01:00
parent 86a9c79b04
commit f3c6d6d51f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
select2.js
View File

@ -2610,13 +2610,15 @@ the specific language governing permissions and limitations under the Apache Lic
selectedChoice = next.length ? next : null; selectedChoice = next.length ? next : null;
} }
else if (e.which === KEY.BACKSPACE) { else if (e.which === KEY.BACKSPACE) {
this.unselect(selected.first()); if (this.unselect(selected.first())) {
this.search.width(10); this.search.width(10);
selectedChoice = prev.length ? prev : next; selectedChoice = prev.length ? prev : next;
}
} else if (e.which == KEY.DELETE) { } else if (e.which == KEY.DELETE) {
this.unselect(selected.first()); if (this.unselect(selected.first())) {
this.search.width(10); this.search.width(10);
selectedChoice = next.length ? next : null; selectedChoice = next.length ? next : null;
}
} else if (e.which == KEY.ENTER) { } else if (e.which == KEY.ENTER) {
selectedChoice = null; selectedChoice = null;
} }
@ -2992,7 +2994,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.opts.element.trigger(evt); this.opts.element.trigger(evt);
if (evt.isDefaultPrevented()) { if (evt.isDefaultPrevented()) {
return; return false;
} }
while((index = indexOf(this.id(data), val)) >= 0) { while((index = indexOf(this.id(data), val)) >= 0) {
@ -3005,6 +3007,8 @@ the specific language governing permissions and limitations under the Apache Lic
this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data }); this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
this.triggerChange({ removed: data }); this.triggerChange({ removed: data });
return true;
}, },
// multi // multi