aboutsummaryrefslogtreecommitdiff
path: root/js/tab.js
diff options
context:
space:
mode:
authorZac Echola <[email protected]>2015-04-28 09:45:16 -0500
committerZac Echola <[email protected]>2015-04-28 09:45:16 -0500
commit407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4 (patch)
treed841221f51dd9852fbce1c562127158d35b8812d /js/tab.js
parente46c998316359f3368d80736d7eb750d85dc4da5 (diff)
parente6438592e9ea28324ba1a4344e724cab28032208 (diff)
downloadbootstrap-407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4.tar.xz
bootstrap-407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4.zip
Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons
Diffstat (limited to 'js/tab.js')
-rw-r--r--js/tab.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tab.js b/js/tab.js
index 935d5bc80..685bbc91f 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -65,7 +65,7 @@
var $active = container.find('> .active')
var transition = callback
&& $.support.transition
- && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length)
+ && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
function next() {
$active