Merge branch '3.0.0-docs-js' of git://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-js

Conflicts:
	javascript.html

1 files changed, 65 insertions, 4 deletions

diff --git a/javascript.html b/javascript.html
index 213f32778..623421c2d 100644
--- a/javascript.html
+++ b/javascript.html
@@ -856,9 +856,40 @@ $('#example').tooltip(options)
     <h4>.tooltip('destroy')</h4>
     <p>Hides and destroys an element's tooltip.</p>
     {% highlight js %}$('#element').tooltip('destroy'){% endhighlight %}
-  </div>
-
 
+    <h3>Events</h3>
+    <table class="table table-bordered table-striped">
+      <thead>
+       <tr>
+         <th style="width: 150px;">Event Type</th>
+         <th>Description</th>
+       </tr>
+      </thead>
+      <tbody>
+       <tr>
+         <td>show</td>
+         <td>This event fires immediately when the <code>show</code> instance method is called.</td>
+       </tr>
+       <tr>
+         <td>shown</td>
+         <td>This event is fired when the tooltip has been made visible to the user (will wait for CSS transitions to complete).</td>
+       </tr>
+       <tr>
+         <td>hide</td>
+         <td>This event is fired immediately when the <code>hide</code> instance method has been called.</td>
+       </tr>
+       <tr>
+         <td>hidden</td>
+         <td>This event is fired when the tooltip has finished being hidden from the user (will wait for CSS transitions to complete).</td>
+       </tr>
+      </tbody>
+    </table>
+{% highlight js %}
+$('#myTooltip').on('hidden.bs.tooltip', function () {
+// do something…
+})
+{% endhighlight %}
+  </div>
 
   <!-- Popovers
   ================================================== -->
@@ -1046,10 +1077,40 @@ $('#example').tooltip(options)
     <h4>.popover('destroy')</h4>
     <p>Hides and destroys an element's popover.</p>
     {% highlight js %}$('#element').popover('destroy'){% endhighlight %}
+    <h3>Events</h3>
+    <table class="table table-bordered table-striped">
+      <thead>
+       <tr>
+         <th style="width: 150px;">Event Type</th>
+         <th>Description</th>
+       </tr>
+      </thead>
+      <tbody>
+       <tr>
+         <td>show</td>
+         <td>This event fires immediately when the <code>show</code> instance method is called.</td>
+       </tr>
+       <tr>
+         <td>shown</td>
+         <td>This event is fired when the popover has been made visible to the user (will wait for CSS transitions to complete).</td>
+       </tr>
+       <tr>
+         <td>hide</td>
+         <td>This event is fired immediately when the <code>hide</code> instance method has been called.</td>
+       </tr>
+       <tr>
+         <td>hidden</td>
+         <td>This event is fired when the popover has finished being hidden from the user (will wait for CSS transitions to complete).</td>
+       </tr>
+      </tbody>
+    </table>
+{% highlight js %}
+$('#myPopover').on('hidden.bs.popover', function () {
+  // do something…
+})
+{% endhighlight %}
   </div>
 
-
-
   <!-- Alert
   ================================================== -->
   <div class="bs-docs-section">