diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
| commit | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (patch) | |
| tree | 32fd8faabe6fdb8d17aea70fc7ccd56524d92aba /js/tab.js | |
| parent | c42cd8164c8698cbc3acfbb99e525bd8f195d819 (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.tar.xz bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.zip | |
Merge branch 'master' into icon_paths
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', |