From 634ea59a259c8d3e4dc164528f984758eebd8883 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Fri, 13 Jun 2014 14:06:55 +0200 Subject: [PATCH 1/2] Allow tabs to fade in if no initially active pane is present; fixes #13814 --- js/tab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/tab.js b/js/tab.js index 8e922ddcbf9b..c46f5182bc5e 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) : From 282f8fc04b3f138b2676a8e345883bd00f8f7599 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Fri, 13 Jun 2014 14:07:34 +0200 Subject: [PATCH 2/2] Add a few more cases to the visual test tab page --- js/tests/visual/tab.html | 109 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 4 deletions(-) diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html index 37921afecb42..28757df6e451 100644 --- a/js/tests/visual/tab.html +++ b/js/tests/visual/tab.html @@ -4,6 +4,9 @@ Tab