diff options
Diffstat (limited to 'assets/javascripts/bootstrap/tab.js')
-rw-r--r-- | assets/javascripts/bootstrap/tab.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js index 4aba86e..845ec67 100644 --- a/assets/javascripts/bootstrap/tab.js +++ b/assets/javascripts/bootstrap/tab.js @@ -45,6 +45,7 @@ var Tab = function ($) { DROPDOWN: '.dropdown', NAV_LIST_GROUP: '.nav, .list-group', ACTIVE: '.active', + ACTIVE_UL: '> li > .active', DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]', DROPDOWN_TOGGLE: '.dropdown-toggle', DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active' @@ -80,7 +81,8 @@ var Tab = function ($) { var selector = Util.getSelectorFromElement(this._element); if (listElement) { - previous = $.makeArray($(listElement).find(Selector.ACTIVE)); + var itemSelector = listElement.nodeName === 'UL' ? Selector.ACTIVE_UL : Selector.ACTIVE; + previous = $.makeArray($(listElement).find(itemSelector)); previous = previous[previous.length - 1]; } @@ -138,7 +140,14 @@ var Tab = function ($) { Tab.prototype._activate = function _activate(element, container, callback) { var _this2 = this; - var active = $(container).find(Selector.ACTIVE)[0]; + var activeElements = void 0; + if (container.nodeName === 'UL') { + activeElements = $(container).find(Selector.ACTIVE_UL); + } else { + activeElements = $(container).children(Selector.ACTIVE); + } + + var active = activeElements[0]; var isTransitioning = callback && Util.supportsTransitionEnd() && active && $(active).hasClass(ClassName.FADE); var complete = function complete() { |