diff options
author | GeoSot <geo.sotis@gmail.com> | 2021-10-10 17:56:34 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@gmail.com> | 2021-12-01 18:10:39 +0300 |
commit | dd07c1ff9ee7102f607fbc8b62222ba51a57e81a (patch) | |
tree | 4d92dba06a5ac348aae2fdb8936fe495a9cd4911 /js/src/dropdown.js | |
parent | f71640f04844f921613efee90b4868871f96f701 (diff) |
Dropdown: clearMenus is always an event callback
Diffstat (limited to 'js/src/dropdown.js')
-rw-r--r-- | js/src/dropdown.js | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 510fcf1a40..6fa3ea37a6 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -351,7 +351,7 @@ class Dropdown extends BaseComponent { } static clearMenus(event) { - if (event && (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY))) { + if (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY)) { return } @@ -371,25 +371,23 @@ class Dropdown extends BaseComponent { relatedTarget: context._element } - if (event) { - const composedPath = event.composedPath() - const isMenuTarget = composedPath.includes(context._menu) - if ( - composedPath.includes(context._element) || - (context._config.autoClose === 'inside' && !isMenuTarget) || - (context._config.autoClose === 'outside' && isMenuTarget) - ) { - continue - } + const composedPath = event.composedPath() + const isMenuTarget = composedPath.includes(context._menu) + if ( + composedPath.includes(context._element) || + (context._config.autoClose === 'inside' && !isMenuTarget) || + (context._config.autoClose === 'outside' && isMenuTarget) + ) { + continue + } - // Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu - if (context._menu.contains(event.target) && ((event.type === 'keyup' && event.key === TAB_KEY) || /input|select|option|textarea|form/i.test(event.target.tagName))) { - continue - } + // Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu + if (context._menu.contains(event.target) && ((event.type === 'keyup' && event.key === TAB_KEY) || /input|select|option|textarea|form/i.test(event.target.tagName))) { + continue + } - if (event.type === 'click') { - relatedTarget.clickEvent = event - } + if (event.type === 'click') { + relatedTarget.clickEvent = event } context._completeHide(relatedTarget) |