Skip to content
GitLab
Commit 8a26268c authored by Pierre-Denis Vanduynslager's avatar Pierre-Denis Vanduynslager
Browse files

Dropdown: remove dependency to role="menu", role="listbox", li and a elements

parent b479efb9
1 merge request!19864Dropdown: remove dependency to role="menu", role="listbox" a and li elements => fix keyboard navigation
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 6 deletions
+3 -6
js/src/dropdown.js
+ 3
- 6
View file @ 8a26268c
...@@ -44,11 +44,9 @@ const Dropdown = (($) => { ...@@ -44,11 +44,9 @@ const Dropdown = (($) => {
BACKDROP : '.dropdown-backdrop', BACKDROP : '.dropdown-backdrop',
DATA_TOGGLE : '[data-toggle="dropdown"]', DATA_TOGGLE : '[data-toggle="dropdown"]',
FORM_CHILD : '.dropdown form', FORM_CHILD : '.dropdown form',
ROLE_MENU : '[role="menu"]', MENU : '.dropdown-menu',
ROLE_LISTBOX : '[role="listbox"]',
NAVBAR_NAV : '.navbar-nav', NAVBAR_NAV : '.navbar-nav',
VISIBLE_ITEMS : '[role="menu"] li:not(.disabled) a, ' VISIBLE_ITEMS : '.dropdown-menu .dropdown-item:not(.disabled)'
+ '[role="listbox"] li:not(.disabled) a'
} }
...@@ -268,8 +266,7 @@ const Dropdown = (($) => { ...@@ -268,8 +266,7 @@ const Dropdown = (($) => {
$(document) $(document)
.on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler) .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler)
.on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler) .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)
.on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler)
.on(Event.CLICK_DATA_API, Dropdown._clearMenus) .on(Event.CLICK_DATA_API, Dropdown._clearMenus)
.on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle) .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
.on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => { .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment