summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-01-21 01:26:21 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-01-21 01:26:21 +0000
commit5c6a7aae090a222f5261f230127b92d1f0622f62 (patch)
treeb9b37df6c2c8a37cb358f25590247cbd28230324
parent3975ee57e34d355e86adf4977feff4fd5ab5d130 (diff)
parent2c6471dd9ab89e326411548dda5401844df4c64e (diff)
downloadgitlab-ce-5c6a7aae090a222f5261f230127b92d1f0622f62.tar.gz
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
-rw-r--r--app/assets/javascripts/droplab/droplab.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js
index ed545ec8748..6c6d650db3a 100644
--- a/app/assets/javascripts/droplab/droplab.js
+++ b/app/assets/javascripts/droplab/droplab.js
@@ -126,7 +126,7 @@ Object.assign(DropDown.prototype, {
var item = this.items[i];
sampleItem = item;
if(item.parentNode && item.parentNode.dataset.hasOwnProperty('dynamic')) {
- item.parentNode.removeChild(item);
+ item.parentNode.removeChild(item);
}
}
@@ -156,7 +156,7 @@ Object.assign(DropDown.prototype, {
if(toAppend) {
toAppend.innerHTML = newChildren.join('');
} else {
- this.list.innerHTML = newChildren.join('');
+ this.list.innerHTML = newChildren.join('');
}
},
@@ -278,7 +278,7 @@ require('./window')(function(w){
self.hooks[i].list.hide();
}
}.bind(this);
- w.addEventListener('click', this.windowClickedWrapper);
+ document.addEventListener('click', this.windowClickedWrapper);
},
removeEvents: function(){
@@ -307,7 +307,7 @@ require('./window')(function(w){
if(!list){
list = document.querySelector(hook.dataset[utils.toDataCamelCase(DATA_TRIGGER)]);
}
-
+
if(hook) {
if(hook.tagName === 'A' || hook.tagName === 'BUTTON') {
this.hooks.push(new HookButton(hook, list, plugins, config));
@@ -578,7 +578,7 @@ require('./window')(function(w){
var listItems = removeHighlight(list);
if(currentIndex>0){
if(!listItems[currentIndex-1]){
- currentIndex = currentIndex-1;
+ currentIndex = currentIndex-1;
}
listItems[currentIndex-1].classList.add('dropdown-active');
}
@@ -630,7 +630,7 @@ require('./window')(function(w){
return;
}
if(currentKey === 'ArrowUp') {
- isUpArrow = true;
+ isUpArrow = true;
}
if(currentKey === 'ArrowDown') {
isDownArrow = true;
@@ -677,7 +677,7 @@ var closest = function(thisTag, stopTag) {
var isDropDownParts = function(target) {
if(target.tagName === 'HTML') { return false; }
return (
- target.hasAttribute(DATA_TRIGGER) ||
+ target.hasAttribute(DATA_TRIGGER) ||
target.hasAttribute(DATA_DROPDOWN)
);
};