From b827303511d68fdb3f913aef63f97b5f77725d68 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 29 Sep 2011 22:21:55 -0700
Subject: [PATCH] changed event should be change event

---
 docs/javascript.html            |  4 ++--
 js/bootstrap-tabs.js            |  2 +-
 js/tests/unit/bootstrap-tabs.js | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index b1816229e7..1f5ad1a38f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -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>
diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js
index 563d88f013..938a54cc04 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 0b92b94db0..3c2610c514 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")