deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-16 20:46:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge fix

Browse source
This commit is contained in:
Simon Babay 2016-08-01 21:30:31 +02:00
parent 8edb33f511
commit 1cb566a0f7
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
assets/scripts/src/choices.js
View file

@ -874,28 +874,20 @@ export class Choices {
const hasShiftKey = e.shiftKey ? true : false;
if(!this.dropdown.classList.contains(this.config.classNames.activeState)) {
if(this.passedElement.type !== 'text') {
// For select inputs we always want to show the dropdown if it isn't already showing
this.showDropdown();
if(this.canSearch){
this.input.focus();
}
}else{
// If input is not in focus, it ought to be
if(this.input !== document.activeElement) {
this.input.focus();
}
if(!this.dropdown.classList.contains(this.config.classNames.activeState)) {
if(this.passedElement.type !== 'text') {
// For select inputs we always want to show the dropdown if it isn't already showing
this.showDropdown();
if(this.canSearch) {
this.input.focus();
}
}else{
// If input is not in focus, it ought to be
if(this.input !== document.activeElement) {
this.input.focus();
}
}
} else if(this.passedElement.type === 'select-one' && this.dropdown.classList.contains(this.config.classNames.activeState) && e.target === this.containerInner) {
this.hideDropdown();
}
// If input is not in focus, it ought to be
if(this.input !== document.activeElement) {
this.input.focus();
}
} else if(this.passedElement.type === 'select-one' && this.dropdown.classList.contains(this.config.classNames.activeState) && e.target === this.containerInner) {
this.hideDropdown();
}