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

Dropdown: remove dependency to role="menu", role="listbox" a and li elements => fix keyboard navigation

Dropdown: remove dependency to role="menu", role="listbox" a and li elements...
Dropdown: remove dependency to role="menu", role="listbox" a and li elements => fix keyboard navigation
ab2fc63d · Pierre-Denis Vanduynslager · f0c0a753 · ab2fc63d
Commit ab2fc63d authored 8 years ago by Pierre-Denis Vanduynslager
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 6 deletions
+3 -6
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -44,11 +44,9 @@ const Dropdown = (($) => {
    BACKDROP      : '.dropdown-backdrop',
    DATA_TOGGLE   : '[data-toggle="dropdown"]',
    FORM_CHILD    : '.dropdown form',
-    ROLE_MENU     : '[role="menu"]',
+    MENU          : '.dropdown-menu',
-    ROLE_LISTBOX  : '[role="listbox"]',
    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 = (($) => {
  $(document)
    .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, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
    .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {