aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAshley Dawson <[email protected]>2014-03-26 22:21:54 +0000
committerAshley Dawson <[email protected]>2014-03-26 22:21:54 +0000
commit138af82e298fd57d2f992a39934067fc5bd99a91 (patch)
tree306a0d74ff5a64c7c2f099bbaa27dc730c7f58bb /js
parentc692c29c7d3dfd3209e3da14912dd5de634b1eac (diff)
downloadbootstrap-138af82e298fd57d2f992a39934067fc5bd99a91.tar.xz
bootstrap-138af82e298fd57d2f992a39934067fc5bd99a91.zip
Fixed nested tab elements li activation
Added closest li instead of direct parent so that you can nest multiple elements within tabs, such as button groups
Diffstat (limited to '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 400cb7b84..74e0a96e8 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -40,7 +40,7 @@
var $target = $(selector)
- this.activate($this.parent('li'), $ul)
+ this.activate($this.closest('li'), $ul)
this.activate($target, $target.parent(), function () {
$this.trigger({
type: 'shown.bs.tab',