From 026e1a1421a7e398f743e49710a0e9f003374753 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Wed, 28 Dec 2016 11:58:50 +0100
Subject: Allow to use nav with tab JS

---
 js/src/tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/src')

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',
-- 
cgit v1.2.3


From c61a0059add8ed03be55601f674bf831d92898b1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 2 Jan 2017 11:52:38 -0800
Subject: update seletors in js

---
 js/src/modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/src')

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'
   }
 
 
-- 
cgit v1.2.3


From bbb0d2b573c28793358be66a1c05f2d68ded4db6 Mon Sep 17 00:00:00 2001
From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Mon, 2 Jan 2017 17:44:27 -0500
Subject: Dropdown: close menu when focusing outside element (#21375)

* Close dropdown menu when focusing an outside element
* Update unit test to new markup
---
 js/src/dropdown.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'js/src')

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 97bba1c76..29c4efe04 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}`
   }
 
@@ -180,9 +181,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
         }
 
@@ -275,7 +276,7 @@ const Dropdown = (($) => {
     .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.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler)
-    .on(Event.CLICK_DATA_API, Dropdown._clearMenus)
+    .on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus)
     .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
     .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {
       e.stopPropagation()
-- 
cgit v1.2.3