From: XhmikosR <xhmikosr@gmail.com>
Date: Fri, 14 Jul 2017 14:49:30 +0000 (+0300)
Subject: tabs: make the `active` selector more restrictive again.
X-Git-Tag: v4.0.0-beta.2~403^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b55fa5579b409be76f551cbb3c1e46e1ad71bdfd;p=thirdparty%2Fbootstrap.git

tabs: make the `active` selector more restrictive again.

When one uses say a carousel inside a tab, the `.active` selector previously matches the carousel ones too leading to broken tabs.

It's not the perfect solution but should the job for now.
---

diff --git a/js/src/tab.js b/js/src/tab.js
index 1613bbb7de..4fd69c5071 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -44,7 +44,7 @@ const Tab = (($) => {
   const Selector = {
     DROPDOWN              : '.dropdown',
     NAV_LIST_GROUP        : '.nav, .list-group',
-    ACTIVE                : '.active',
+    ACTIVE                : '> .nav-item > .active, > .active',
     DATA_TOGGLE           : '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
     DROPDOWN_TOGGLE       : '.dropdown-toggle',
     DROPDOWN_ACTIVE_CHILD : '> .dropdown-menu .active'