mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 21:09:06 +02:00
Code Issues Releases Wiki Activity

Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event

Browse Source
This commit is contained in:
Jacob Thornton
2011-09-29 22:18:08 -07:00
parent 68605bdd51 e16de59260
commit 24b05fe94a
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/bootstrap-tabs.js vendored
View File

@@ -30,11 +30,12 @@
, href = $this.attr('href')
, $ul = $this.closest('ul')
, $controlled
, current = $ul.find('.active a').attr('href')
if (/^#\w+/.test(href)) {
e.preventDefault()
if ($this.hasClass('active')) {
if ($this.parent('li').hasClass('active')) {
return
}
@@ -42,6 +43,7 @@
activate($this.parent('li'), $ul)
activate($href, $href.parent())
$this.trigger("changed", {from:current, to:href})
}
}
@@ -59,4 +61,4 @@
$('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
})
}( window.jQuery || window.ender );
}( window.jQuery || window.ender );