Merge branch 'tab-select' of https://github.com/greatbigsolutions/chosen into greatbigsolutions-tab-select
Conflicts: chosen/chosen.jquery.min.js chosen/chosen.proto.min.js
This commit is contained in:
commit
c772be4cc1
|
@ -831,6 +831,9 @@
|
|||
this.backstroke_length = this.search_field.val().length;
|
||||
break;
|
||||
case 9:
|
||||
if (this.results_showing && !this.is_multiple) {
|
||||
this.result_select(evt);
|
||||
}
|
||||
this.mouse_on_container = false;
|
||||
break;
|
||||
case 13:
|
||||
|
|
2
chosen/chosen.jquery.min.js
vendored
2
chosen/chosen.jquery.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -841,16 +841,24 @@
|
|||
}
|
||||
switch (stroke) {
|
||||
case 8:
|
||||
return this.backstroke_length = this.search_field.value.length;
|
||||
this.backstroke_length = this.search_field.value.length;
|
||||
break;
|
||||
case 9:
|
||||
return this.mouse_on_container = false;
|
||||
if (this.results_showing && !this.is_multiple) {
|
||||
this.result_select(evt);
|
||||
}
|
||||
this.mouse_on_container = false;
|
||||
break;
|
||||
case 13:
|
||||
return evt.preventDefault();
|
||||
evt.preventDefault();
|
||||
break;
|
||||
case 38:
|
||||
evt.preventDefault();
|
||||
return this.keyup_arrow();
|
||||
this.keyup_arrow();
|
||||
break;
|
||||
case 40:
|
||||
return this.keydown_arrow();
|
||||
this.keydown_arrow();
|
||||
break;
|
||||
}
|
||||
};
|
||||
Chosen.prototype.search_field_scale = function() {
|
||||
|
|
2
chosen/chosen.proto.min.js
vendored
2
chosen/chosen.proto.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -497,6 +497,7 @@ class Chosen extends AbstractChosen
|
|||
@backstroke_length = this.search_field.val().length
|
||||
break
|
||||
when 9
|
||||
this.result_select(evt) if this.results_showing and not @is_multiple
|
||||
@mouse_on_container = false
|
||||
break
|
||||
when 13
|
||||
|
|
|
@ -490,15 +490,21 @@ class Chosen extends AbstractChosen
|
|||
switch stroke
|
||||
when 8
|
||||
@backstroke_length = this.search_field.value.length
|
||||
break
|
||||
when 9
|
||||
this.result_select(evt) if this.results_showing and not @is_multiple
|
||||
@mouse_on_container = false
|
||||
break
|
||||
when 13
|
||||
evt.preventDefault()
|
||||
break
|
||||
when 38
|
||||
evt.preventDefault()
|
||||
this.keyup_arrow()
|
||||
break
|
||||
when 40
|
||||
this.keydown_arrow()
|
||||
break
|
||||
|
||||
search_field_scale: ->
|
||||
if @is_multiple
|
||||
|
|
Loading…
Reference in a new issue