rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity

changed event should be change event

Browse Source
This commit is contained in:
Jacob Thornton 2011-09-29 22:21:55 -07:00
parent 24b05fe94a
commit b827303511
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/javascript.html
View File

@ -367,8 +367,8 @@ $('#my-modal').bind('hidden', function () {
</thead>
<tbody>
<tr>
<td>changed</td>
<td>This event fires when the tabs are changed. The event provides an additional parameter which holds id of the previous tab and the id of the new current tab. This information is stored in an object with two properties called from and to, e.g. <code>{to: '#home', from: '#profile'}</code>. This event allows you load and change content of the tabs on request.</td>
<td>change</td>
<td>This event fires on tab change. The event provides an additional parameter which holds the id of the previous tab and the id of the new current tab. This information is stored in an object with two properties called from and to, e.g. <code>{ to: '#home', from: '#profile' }</code>.</td>
</tr>
</tbody>
</table>

2
js/bootstrap-tabs.js vendored
View File

@ -43,7 +43,7 @@
activate($this.parent('li'), $ul)
activate($href, $href.parent())
$this.trigger("changed", {from:current, to:href})
$this.trigger("change", { from: current, to: href })
}
}

10
js/tests/unit/bootstrap-tabs.js vendored
View File

@ -45,8 +45,8 @@ $(function () {
$("#qunit-runoff").empty()
})
test( "should trigger changed event on activate", function () {
test( "should trigger change event on activate", function () {
var $tabsHTML = $('<ul class="tabs">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
@ -54,13 +54,13 @@ $(function () {
, changeCount = 0
, from
, to;
$tabsHTML.tabs().bind( "changed", function (e, c){
$tabsHTML.tabs().bind( "change", function (e, c){
from = c.from;
to = c.to;
changeCount++
})
$tabsHTML.tabs().find('a').last().click()
equals(from, "#home")