diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /js/src | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/dropdown.js | 13 | ||||
| -rw-r--r-- | js/src/modal.js | 2 | ||||
| -rw-r--r-- | js/src/tab.js | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index bcf13caf1..46287fb90 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -35,6 +35,7 @@ const Dropdown = (($) => { SHOWN : `shown${EVENT_KEY}`, CLICK : `click${EVENT_KEY}`, CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`, + FOCUSIN_DATA_API : `focusin${EVENT_KEY}${DATA_API_KEY}`, KEYDOWN_DATA_API : `keydown${EVENT_KEY}${DATA_API_KEY}` } @@ -178,9 +179,9 @@ const Dropdown = (($) => { continue } - if (event && event.type === 'click' && - /input|textarea/i.test(event.target.tagName) && - $.contains(parent, event.target)) { + if (event && (event.type === 'click' && + /input|textarea/i.test(event.target.tagName) || event.type === 'focusin') + && $.contains(parent, event.target)) { continue } @@ -271,8 +272,14 @@ 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, Dropdown._clearMenus) +======= + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler) + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler) + .on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus) +>>>>>>> twbs/v4-dev .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle) .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => { e.stopPropagation() diff --git a/js/src/modal.js b/js/src/modal.js index 94abd19f4..484edcada 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -67,7 +67,7 @@ const Modal = (($) => { DIALOG : '.modal-dialog', DATA_TOGGLE : '[data-toggle="modal"]', DATA_DISMISS : '[data-dismiss="modal"]', - FIXED_CONTENT : '.navbar-fixed-top, .navbar-fixed-bottom, .is-fixed' + FIXED_CONTENT : '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top' } diff --git a/js/src/tab.js b/js/src/tab.js index 2f4e453e0..745aa808b 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -45,7 +45,7 @@ const Tab = (($) => { A : 'a', LI : 'li', DROPDOWN : '.dropdown', - LIST : 'ul:not(.dropdown-menu), ol:not(.dropdown-menu)', + LIST : 'ul:not(.dropdown-menu), ol:not(.dropdown-menu), nav:not(.dropdown-menu)', FADE_CHILD : '> .nav-item .fade, > .fade', ACTIVE : '.active', ACTIVE_CHILD : '> .nav-item > .active, > .active', |