diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:27:40 -0700 |
| commit | 707b362b801d7a430c1911493a65085e81b4ee8d (patch) | |
| tree | b659b23c3884e9100c1e800161e96110a0853294 /js/tab.js | |
| parent | bdd822a94cdf2d452e067569e76ca1537dc74d8d (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.tar.xz bootstrap-707b362b801d7a430c1911493a65085e81b4ee8d.zip | |
Merge branch 'master' into docs-theme-toggler
Conflicts:
docs/assets/css/docs.min.css
Diffstat (limited to 'js/tab.js')
| -rw-r--r-- | js/tab.js | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -17,6 +17,8 @@ this.element = $(element) } + Tab.VERSION = '3.1.1' + Tab.prototype.show = function () { var $this = this.element var $ul = $this.closest('ul:not(.dropdown-menu)') @@ -40,7 +42,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', |