mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 18:44:01 +02:00
Code Issues Releases Wiki Activity

Fix unit tests.

Browse Source
This commit is contained in:
Johann-S
2017-10-26 13:26:19 +03:00
committed by XhmikosR
parent 6fe72c6de8
commit 41fbec1188
2 changed files with 185 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/dropdown.js
View File

@@ -62,11 +62,6 @@ const Dropdown = (($) => {
const Selector = {
DATA_TOGGLE : '[data-toggle="dropdown"]',
FORM_CHILD : '.dropdown form',
<<<<<<< HEAD
=======
ROLE_MENU : '[role="menu"]',
ROLE_LISTBOX : '[role="listbox"]',
>>>>>>> Dropdown handle keydown on input and textarea
MENU : '.dropdown-menu',
NAVBAR_NAV : '.navbar-nav',
VISIBLE_ITEMS : '.dropdown-menu .dropdown-item:not(.disabled)'
@@ -366,7 +361,7 @@ const Dropdown = (($) => {
// - And not a key in REGEXP_KEYDOWN => not a dropdown command
// If input/textarea:
// - If space key => not a dropdown command
// - If key is other than excape
// - 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
if (/input|textarea/i.test(event.target.tagName) ?
@@ -432,7 +427,6 @@ const Dropdown = (($) => {
$(document)
.on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler)
<<<<<<< HEAD
.on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)
.on(`${Event.CLICK_DATA_API} ${Event.KEYUP_DATA_API}`, Dropdown._clearMenus)
.on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
@@ -440,13 +434,6 @@ const Dropdown = (($) => {
event.stopPropagation()
Dropdown._jQueryInterface.call($(this), 'toggle')
})
=======
.on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler)
.on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler)
.on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)
.on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus)
.on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
>>>>>>> Dropdown handle keydown on input and textarea
.on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {
e.stopPropagation()
})