From: Heinrich Fenkart Date: Fri, 13 Jun 2014 12:06:55 +0000 (+0200) Subject: Allow tabs to fade in if no initially active pane is present; fixes #13814 X-Git-Tag: v3.3.0~389^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=634ea59a259c8d3e4dc164528f984758eebd8883;p=thirdparty%2Fbootstrap.git Allow tabs to fade in if no initially active pane is present; fixes #13814 --- diff --git a/js/tab.js b/js/tab.js index 8e922ddcbf..c46f5182bc 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) :