Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorGeoSot <geo.sotis@gmail.com>2021-10-10 16:31:39 +0300
committerXhmikosR <xhmikosr@gmail.com>2021-12-01 18:10:39 +0300
commit0686fa00f04f5479753a32890dcae25b6c134e71 (patch)
tree48d2e26d22ad09b4bfb3841fe3489cb29952476f /js
parenta14a552d83a8f5452f2ef53a6a85a91c8aafb5f7 (diff)
Dropdown: Remove redundant `Space` check
Diffstat (limited to 'js')
-rw-r--r--js/src/dropdown.js18
1 files changed, 4 insertions, 14 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 90bc582b96..c769ed5046 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -33,7 +33,6 @@ const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
const ESCAPE_KEY = 'Escape'
-const SPACE_KEY = 'Space'
const TAB_KEY = 'Tab'
const ARROW_UP_KEY = 'ArrowUp'
const ARROW_DOWN_KEY = 'ArrowDown'
@@ -399,11 +398,10 @@ class Dropdown extends BaseComponent {
static dataApiKeydownHandler(event) {
// If not input/textarea:
- // - And not a key in REGEXP_KEYDOWN => not a dropdown command
+ // - And not a key in UP | DOWN | ESCAPE => not a dropdown command
// If input/textarea:
- // - If space key => not a dropdown command
- // - If key is other than escape
- // - If key is not up or down => not a dropdown command
+ // - If key is other than ESCAPE
+ // - If key is not UP or DOWN => not a dropdown command
// - If trigger inside the menu => not a dropdown command
const isInput = /input|textarea/i.test(event.target.tagName)
@@ -413,10 +411,7 @@ class Dropdown extends BaseComponent {
}
if (isInput) {
- if (eventKey === SPACE_KEY) {
- return
- }
-
+ // eslint-disable-next-line unicorn/no-lonely-if
if (eventKey !== ESCAPE_KEY && (![ARROW_UP_KEY, ARROW_DOWN_KEY].includes(eventKey) || event.target.closest(SELECTOR_MENU))) {
return
}
@@ -446,11 +441,6 @@ class Dropdown extends BaseComponent {
if (event.key === ARROW_UP_KEY || event.key === ARROW_DOWN_KEY) {
instance.show()
instance._selectMenuItem(event)
- return
- }
-
- if (!isActive || event.key === SPACE_KEY) {
- Dropdown.clearMenus()
}
}
}