diff options
| author | Mark Otto <[email protected]> | 2011-09-09 00:03:01 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-09 00:03:01 -0700 |
| commit | df3ca4d94a69436c1d6c53f5559aefca98fb2232 (patch) | |
| tree | 6a37e8a908186ccd917f18c606606a61e1b2a551 /docs/assets | |
| parent | 1d4e345ec1d9afce1f2d4cce8334a3bf6789eced (diff) | |
| parent | b086d9425345844df597a6ae6b450dde7f4fb762 (diff) | |
| download | bootstrap-df3ca4d94a69436c1d6c53f5559aefca98fb2232.tar.xz bootstrap-df3ca4d94a69436c1d6c53f5559aefca98fb2232.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/js/bootstrap-tabs.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap-tabs.js b/docs/assets/js/bootstrap-tabs.js index 21386f4cf..029ccc65c 100644 --- a/docs/assets/js/bootstrap-tabs.js +++ b/docs/assets/js/bootstrap-tabs.js @@ -11,17 +11,17 @@ , $ul = $(e.liveFired) , $controlled - if (/^#/.test(href)) { + if (/^#\w+/.test(href)) { e.preventDefault() if ($this.hasClass('active')) { return } - $controlled = $('#' + $ul.attr('aria-controls')) + $href = $(href) activate($this.parent('li'), $ul) - activate($(href, $controlled), $controlled) + activate($href, $href.parent()) } } @@ -31,7 +31,7 @@ $.fn.tabs = $.fn.pills = function () { return this.each(function () { - $(this).delegate('.tabs > li > a, .pills > li > a', 'click', tab) + $(this).delegate('.tabs > li > a, .pills > li > a, .dropdown-menu > li > a', 'click', tab) }) } |