From: Ashley Dawson Date: Wed, 26 Mar 2014 22:21:54 +0000 (+0000) Subject: Fixed nested tab elements li activation X-Git-Tag: v3.2.0~167^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138af82e298fd57d2f992a39934067fc5bd99a91;p=thirdparty%2Fbootstrap.git 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 --- diff --git a/js/tab.js b/js/tab.js index 400cb7b841..74e0a96e82 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',