diff options
author | GeoSot <geo.sotis@gmail.com> | 2022-03-10 14:24:47 +0300 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2022-04-13 18:41:03 +0300 |
commit | cfd2f3f7787ba22feb78d916956f6f73746f3ee3 (patch) | |
tree | 48f20f2b85cfc30731bea2e04c2888ce19f77731 /js/src/dropdown.js | |
parent | 87da34014a6479e94130f04564898292dbc7586d (diff) |
Update dropdown.js
minor refactoring
Diffstat (limited to 'js/src/dropdown.js')
-rw-r--r-- | js/src/dropdown.js | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 65b3aa372a..dfa9a63aad 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -404,25 +404,22 @@ class Dropdown extends BaseComponent { } event.preventDefault() - if (!isEscapeEvent) { - event.stopPropagation() - } const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, event.delegateTarget.parentNode) const instance = Dropdown.getOrCreateInstance(getToggleButton) - if (isEscapeEvent) { - if (getToggleButton.classList.contains(CLASS_NAME_SHOW)) { - instance.hide() - getToggleButton.focus() - event.stopPropagation() - } - + if (isUpOrDownEvent) { + event.stopPropagation() + instance.show() + instance._selectMenuItem(event) return } - instance.show() - instance._selectMenuItem(event) + if (instance._isShown()) { // else is escape and we check if it is shown + event.stopPropagation() + instance.hide() + getToggleButton.focus() + } } } |