diff --git a/docs/javascript.html b/docs/javascript.html index b1816229e..1f5ad1a38 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -367,8 +367,8 @@ $('#my-modal').bind('hidden', function () { - changed - 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. {to: '#home', from: '#profile'}. This event allows you load and change content of the tabs on request. + change + 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. { to: '#home', from: '#profile' }. 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 = $('