diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:24:33 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:24:33 -0500 |
| commit | 67958f35e80af425c08fa367e8a6f1eeefb830bc (patch) | |
| tree | bbf7964688d1e6fa0524a0aeb5c4dd75a1fc10ac /js | |
| parent | c4867cfedb6235708967aa8518c59ffed2816f0b (diff) | |
| download | bootstrap-67958f35e80af425c08fa367e8a6f1eeefb830bc.tar.xz bootstrap-67958f35e80af425c08fa367e8a6f1eeefb830bc.zip | |
Merge conflict
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/dropdown.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 46287fb90..873c106a7 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -272,14 +272,8 @@ 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() |