From 5a5ab4c0de0981680fa1764e33967c8d3d4cacf5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Mar 2017 16:51:32 -0700 Subject: [PATCH] grunt --- js/dist/tab.js | 12 +++++++++--- js/dist/tab.js.map | Bin 13634 -> 14260 bytes 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/js/dist/tab.js b/js/dist/tab.js index eedbc3f8e..26117b386 100644 --- a/js/dist/tab.js +++ b/js/dist/tab.js @@ -45,10 +45,10 @@ var Tab = function ($) { 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' @@ -163,6 +163,9 @@ var Tab = function ($) { Tab.prototype._transitionComplete = function _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); + } var dropdownChild = $(active.parentNode).find(Selector.DROPDOWN_ACTIVE_CHILD)[0]; @@ -174,6 +177,9 @@ var Tab = function ($) { } $(element).addClass(ClassName.ACTIVE); + if ($(element.parentNode).hasClass('list-group-item')) { + $(element.parentNode).addClass(ClassName.ACTIVE); + } element.setAttribute('aria-expanded', true); if (isTransitioning) { diff --git a/js/dist/tab.js.map b/js/dist/tab.js.map index 01047d473a466fe501185de42312eb03ac00d33a..a2a76e98c4b1f38c4bd36b60c9a0d90398f8a008 100644 GIT binary patch delta 578 zcmX?#nmI-4ggZK#gAJ&3Hg?tt1*&ufY07f}ndD*(BwbxL=L-rlvV$Z+78eVv zMu08WM_616R$k-+v>2$$)xt?9(9to_9mEL(*;MRQ>WO-JiDkMunR(gjlXJBtCV$Y8n|xM}Z?m(G86ykGlF99Q c^5Qs*om{Uc$DEjwGWmgyJY((VLfwn(09`(zFwKxq;3)zCd1(j;mwo zW>K-}jEohN*NVF`nfY)2B7TmMzbY_X$JwzmFr?BAsIY4DMM)mE$^YcdC;Ka;Z@!|i UpJ%g_o*(06J|o@D5(abF0nYe2Y5)KL