diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-24 13:45:05 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-24 13:45:05 +0300 |
| commit | 7dabca1b969a76a0c9a6e336b49937d84e002637 (patch) | |
| tree | de2f24bd1c269f088f9b6d53c3e55efa62e0cc21 /app/assets/javascripts/droplab/drop_down.js | |
| parent | a695b855e078b1900d0ded11ae3fab1e547e442f (diff) | |
| parent | c768026474b9dff9f6f988372e4eefb85b1d8be9 (diff) | |
Merge branch 'master' into droplab-templating-xss-fix
Diffstat (limited to 'app/assets/javascripts/droplab/drop_down.js')
| -rw-r--r-- | app/assets/javascripts/droplab/drop_down.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/droplab/drop_down.js b/app/assets/javascripts/droplab/drop_down.js index 084d57e2e1f..de3927d683c 100644 --- a/app/assets/javascripts/droplab/drop_down.js +++ b/app/assets/javascripts/droplab/drop_down.js @@ -1,7 +1,7 @@ /* eslint-disable */ import utils from './utils'; -import { SELECTED_CLASS } from './constants'; +import { SELECTED_CLASS, IGNORE_CLASS } from './constants'; var DropDown = function(list) { this.currentIndex = 0; @@ -36,6 +36,7 @@ Object.assign(DropDown.prototype, { clickEvent: function(e) { if (e.target.tagName === 'UL') return; + if (e.target.classList.contains(IGNORE_CLASS)) return; var selected = utils.closest(e.target, 'LI'); if (!selected) return; |