diff options
| author | Mark Otto <[email protected]> | 2017-03-18 16:50:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-03-18 16:50:02 -0700 |
| commit | eb2a9da5b4123ada8e564ba0045132b18bd135ba (patch) | |
| tree | 7d3740bac126c68d5b84abb067fda7243d681c69 /js/src | |
| parent | 5f3473258e5e9f3d2d9da165312e8374c55250e6 (diff) | |
| parent | 1a46d8c7309092566c2da8cbaa9999ae0a1bacc7 (diff) | |
| download | bootstrap-eb2a9da5b4123ada8e564ba0045132b18bd135ba.tar.xz bootstrap-eb2a9da5b4123ada8e564ba0045132b18bd135ba.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/tab.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/js/src/tab.js b/js/src/tab.js index c069b0a9a..d5669b7ad 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -45,10 +45,10 @@ const Tab = (($) => { A : 'a', LI : 'li', DROPDOWN : '.dropdown', - LIST : 'ul:not(.dropdown-menu), ol:not(.dropdown-menu), nav:not(.dropdown-menu)', - FADE_CHILD : '> .nav-item .fade, > .fade', + LIST : 'ul:not(.dropdown-menu), ol:not(.dropdown-menu), nav:not(.dropdown-menu), .list-group:not(.dropdown-menu)', + FADE_CHILD : '> .nav-item .fade, > .list-group-item .fade, > .fade', ACTIVE : '.active', - ACTIVE_CHILD : '> .nav-item > .active, > .active', + ACTIVE_CHILD : '> .nav-item > .active, > .list-group-item > .active, > .active', DATA_TOGGLE : '[data-toggle="tab"], [data-toggle="pill"]', DROPDOWN_TOGGLE : '.dropdown-toggle', DROPDOWN_ACTIVE_CHILD : '> .dropdown-menu .active' @@ -182,6 +182,9 @@ const Tab = (($) => { _transitionComplete(element, active, isTransitioning, callback) { if (active) { $(active).removeClass(ClassName.ACTIVE) + if ($(active).hasClass('list-group-item')) { + $(active).find('a.nav-link').removeClass(ClassName.ACTIVE) + } const dropdownChild = $(active.parentNode).find( Selector.DROPDOWN_ACTIVE_CHILD @@ -195,6 +198,9 @@ const Tab = (($) => { } $(element).addClass(ClassName.ACTIVE) + if ($(element.parentNode).hasClass('list-group-item')) { + $(element.parentNode).addClass(ClassName.ACTIVE) + } element.setAttribute('aria-expanded', true) if (isTransitioning) { |