aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Fenkart <[email protected]>2014-06-13 14:06:55 +0200
committerHeinrich Fenkart <[email protected]>2014-06-25 04:18:51 +0200
commit634ea59a259c8d3e4dc164528f984758eebd8883 (patch)
tree2387c807ea25a49b6f2c599abb797b70e0fcf188
parent4abb0957833c7158563244d1770ab9a5e6966150 (diff)
downloadbootstrap-634ea59a259c8d3e4dc164528f984758eebd8883.tar.xz
bootstrap-634ea59a259c8d3e4dc164528f984758eebd8883.zip
Allow tabs to fade in if no initially active pane is present; fixes #13814
-rw-r--r--js/tab.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tab.js b/js/tab.js
index 8e922ddcb..c46f5182b 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -55,7 +55,7 @@
var $active = container.find('> .active')
var transition = callback
&& $.support.transition
- && $active.hasClass('fade')
+ && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length)
function next() {
$active
@@ -79,7 +79,7 @@
callback && callback()
}
- transition ?
+ $active.length && transition ?
$active
.one('bsTransitionEnd', next)
.emulateTransitionEnd(150) :