aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-29 23:42:58 -0700
committerJacob Thornton <[email protected]>2011-09-29 23:42:58 -0700
commitfda10a609ce02920141e2b35504750ed9fa31a20 (patch)
treeb918f27835a4810324bc4aeb038e80486aea485e /js
parentb2b8a789718d8a2cc3248509a94eee36ead6f504 (diff)
parent9a2440aafa8902d713ac78c3aa0823ffcd83d70a (diff)
downloadbootstrap-fda10a609ce02920141e2b35504750ed9fa31a20.tar.xz
bootstrap-fda10a609ce02920141e2b35504750ed9fa31a20.zip
Merge pull request #329 from lmjabreu/master
make tabs plugin play well with nested tabs
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js
index e0286a364..e8e2dc622 100644
--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@ -21,7 +21,7 @@
!function( $ ){
function activate ( element, container ) {
- container.find('.active').removeClass('active')
+ container.find('> .active').removeClass('active')
element.addClass('active')
}