Commit 5c6a7aae authored by Jacob Schatz's avatar Jacob Schatz

Merge branch...

Merge branch '26617-search-bar-filter-dropdown-does-not-dismiss-when-sort-dropdown-is-selected' into 'master'

Changed the event listener target from window to document in droplab

Closes #26617

See merge request !8670
parents 3975ee57 2c6471dd
...@@ -126,7 +126,7 @@ Object.assign(DropDown.prototype, { ...@@ -126,7 +126,7 @@ Object.assign(DropDown.prototype, {
var item = this.items[i]; var item = this.items[i];
sampleItem = item; sampleItem = item;
if(item.parentNode && item.parentNode.dataset.hasOwnProperty('dynamic')) { if(item.parentNode && item.parentNode.dataset.hasOwnProperty('dynamic')) {
item.parentNode.removeChild(item); item.parentNode.removeChild(item);
} }
} }
...@@ -156,7 +156,7 @@ Object.assign(DropDown.prototype, { ...@@ -156,7 +156,7 @@ Object.assign(DropDown.prototype, {
if(toAppend) { if(toAppend) {
toAppend.innerHTML = newChildren.join(''); toAppend.innerHTML = newChildren.join('');
} else { } else {
this.list.innerHTML = newChildren.join(''); this.list.innerHTML = newChildren.join('');
} }
}, },
...@@ -278,7 +278,7 @@ require('./window')(function(w){ ...@@ -278,7 +278,7 @@ require('./window')(function(w){
self.hooks[i].list.hide(); self.hooks[i].list.hide();
} }
}.bind(this); }.bind(this);
w.addEventListener('click', this.windowClickedWrapper); document.addEventListener('click', this.windowClickedWrapper);
}, },
removeEvents: function(){ removeEvents: function(){
...@@ -307,7 +307,7 @@ require('./window')(function(w){ ...@@ -307,7 +307,7 @@ require('./window')(function(w){
if(!list){ if(!list){
list = document.querySelector(hook.dataset[utils.toDataCamelCase(DATA_TRIGGER)]); list = document.querySelector(hook.dataset[utils.toDataCamelCase(DATA_TRIGGER)]);
} }
if(hook) { if(hook) {
if(hook.tagName === 'A' || hook.tagName === 'BUTTON') { if(hook.tagName === 'A' || hook.tagName === 'BUTTON') {
this.hooks.push(new HookButton(hook, list, plugins, config)); this.hooks.push(new HookButton(hook, list, plugins, config));
...@@ -578,7 +578,7 @@ require('./window')(function(w){ ...@@ -578,7 +578,7 @@ require('./window')(function(w){
var listItems = removeHighlight(list); var listItems = removeHighlight(list);
if(currentIndex>0){ if(currentIndex>0){
if(!listItems[currentIndex-1]){ if(!listItems[currentIndex-1]){
currentIndex = currentIndex-1; currentIndex = currentIndex-1;
} }
listItems[currentIndex-1].classList.add('dropdown-active'); listItems[currentIndex-1].classList.add('dropdown-active');
} }
...@@ -630,7 +630,7 @@ require('./window')(function(w){ ...@@ -630,7 +630,7 @@ require('./window')(function(w){
return; return;
} }
if(currentKey === 'ArrowUp') { if(currentKey === 'ArrowUp') {
isUpArrow = true; isUpArrow = true;
} }
if(currentKey === 'ArrowDown') { if(currentKey === 'ArrowDown') {
isDownArrow = true; isDownArrow = true;
...@@ -677,7 +677,7 @@ var closest = function(thisTag, stopTag) { ...@@ -677,7 +677,7 @@ var closest = function(thisTag, stopTag) {
var isDropDownParts = function(target) { var isDropDownParts = function(target) {
if(target.tagName === 'HTML') { return false; } if(target.tagName === 'HTML') { return false; }
return ( return (
target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_TRIGGER) ||
target.hasAttribute(DATA_DROPDOWN) target.hasAttribute(DATA_DROPDOWN)
); );
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment