mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 16:14:04 +02:00
Code Issues Releases Wiki Activity

When we show our tabs element use children to be more restrictive

Browse Source
This commit is contained in:
Johann-S
2017-07-16 16:04:37 +02:00
committed by XhmikosR
parent b55fa5579b
commit 640c13062c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/tab.js
View File

@@ -44,7 +44,7 @@ const Tab = (($) => {
const Selector = { const Selector = {
DROPDOWN : '.dropdown', DROPDOWN : '.dropdown',
NAV_LIST_GROUP : '.nav, .list-group', NAV_LIST_GROUP : '.nav, .list-group',
ACTIVE : '> .nav-item > .active, > .active', ACTIVE : '.active',
DATA_TOGGLE : '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]', DATA_TOGGLE : '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE : '.dropdown-toggle', DROPDOWN_TOGGLE : '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD : '> .dropdown-menu .active' DROPDOWN_ACTIVE_CHILD : '> .dropdown-menu .active'
@@ -148,7 +148,8 @@ const Tab = (($) => {
// private // private
_activate(element, container, callback) { _activate(element, container, callback) {
const active = $(container).find(Selector.ACTIVE)[0] const activeElements = callback ? $(container).children(Selector.ACTIVE) : $(container).find(Selector.ACTIVE)
const active = activeElements[0]
const isTransitioning = callback const isTransitioning = callback
&& Util.supportsTransitionEnd() && Util.supportsTransitionEnd()
&& (active && $(active).hasClass(ClassName.FADE)) && (active && $(active).hasClass(ClassName.FADE))