From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Wed, 4 Jan 2017 17:22:06 +0000 (-0500)
Subject: Merge branch 'twbs/v4-dev' into dropdown-keyboard
X-Git-Tag: v4.0.0-beta~166^2~96^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4867cfedb6235708967aa8518c59ffed2816f0b;p=thirdparty%2Fbootstrap.git

Merge branch 'twbs/v4-dev' into dropdown-keyboard

# Conflicts:
#	js/src/dropdown.js
---

c4867cfedb6235708967aa8518c59ffed2816f0b
diff --cc js/src/dropdown.js
index bcf13caf13,29c4efe047..46287fb905
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@@ -271,8 -274,9 +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()