aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-19 20:14:33 -0700
committerJacob Thornton <[email protected]>2011-09-19 20:14:33 -0700
commit01ab4caa5b967470edd11348e012386096d47506 (patch)
tree90b631ba366d7bf29e727fee19ec0d0b4cf93c09
parent0c6a2acd7e9a6d81eeec4dba99b4bdf33e86c744 (diff)
parent75cbf0d25163bcc2f2c4fcc9395b39d3f005a8b8 (diff)
downloadbootstrap-01ab4caa5b967470edd11348e012386096d47506.tar.xz
bootstrap-01ab4caa5b967470edd11348e012386096d47506.zip
Merge branch 'master' of github.com:twitter/bootstrap
-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 1426d30ed..c98403a2d 100644
--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@ -28,7 +28,7 @@
function tab( e ) {
var $this = $(this)
, href = $this.attr('href')
- , $ul = $(e.liveFired)
+ , $ul = $this.closest('ul')
, $controlled
if (/^#\w+/.test(href)) {