diff options
| author | Jacob Thornton <[email protected]> | 2011-09-29 22:21:55 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-29 22:21:55 -0700 |
| commit | b827303511d68fdb3f913aef63f97b5f77725d68 (patch) | |
| tree | 73b7c539dc3daa75a6be665da3c6d45542b73b52 /js | |
| parent | 24b05fe94a46a5b21a122a08b967eeb3ee6e6a86 (diff) | |
| download | bootstrap-b827303511d68fdb3f913aef63f97b5f77725d68.tar.xz bootstrap-b827303511d68fdb3f913aef63f97b5f77725d68.zip | |
changed event should be change event
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-tabs.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-tabs.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js index 563d88f01..938a54cc0 100644 --- a/js/bootstrap-tabs.js +++ b/js/bootstrap-tabs.js @@ -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 }) } } diff --git a/js/tests/unit/bootstrap-tabs.js b/js/tests/unit/bootstrap-tabs.js index 0b92b94db..3c2610c51 100644 --- a/js/tests/unit/bootstrap-tabs.js +++ b/js/tests/unit/bootstrap-tabs.js @@ -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") |