Merge pull request #13815 from hnrch02/tabs-fade-not-active

Allow tabs to fade in if no initially active pane is present
twbs · Jul 6, 2014 · 279c461 · 279c461
2 parents 0a8845c + 282f8fc
commit 279c461
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 6 deletions.
diff --git 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) :