1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 07:39:57 +02:00

change event to use target and relatedTarget (which more closely resembles actual event api)

This commit is contained in:
Jacob Thornton
2011-09-29 23:00:10 -07:00
parent b827303511
commit a0bf8b67ff
3 changed files with 30 additions and 19 deletions

12
js/bootstrap-tabs.js vendored
View File

@@ -27,10 +27,9 @@
function tab( e ) {
var $this = $(this)
, href = $this.attr('href')
, $ul = $this.closest('ul')
, $controlled
, current = $ul.find('.active a').attr('href')
, href = $this.attr('href')
, previous
if (/^#\w+/.test(href)) {
e.preventDefault()
@@ -39,11 +38,16 @@
return
}
previous = $ul.find('.active a')[0]
$href = $(href)
activate($this.parent('li'), $ul)
activate($href, $href.parent())
$this.trigger("change", { from: current, to: href })
$this.trigger({
type: 'change'
, relatedTarget: previous
})
}
}

View File

@@ -51,21 +51,27 @@ $(function () {
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>')
, changeCount = 0
, from
, to;
, $target
, count = 0
, relatedTarget
, target
$tabsHTML.tabs().bind( "change", function (e, c){
from = c.from;
to = c.to;
changeCount++
})
$tabsHTML
.tabs()
.bind( "change", function (e) {
target = e.target
relatedTarget = e.relatedTarget
count++
})
$tabsHTML.tabs().find('a').last().click()
$target = $tabsHTML
.find('a')
.last()
.click()
equals(from, "#home")
equals(to, "#profile")
equals(changeCount, 1)
equals(relatedTarget, $tabsHTML.find('a').first()[0])
equals(target, $target[0])
equals(count, 1)
})
})