From: Chris Rebert <code@rebertia.com>
Date: Wed, 1 Jul 2015 23:42:13 +0000 (-0700)
Subject: Document that Tab show method is async
X-Git-Tag: v3.3.6~92^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16747%2Fhead;p=thirdparty%2Fbootstrap.git

Document that Tab show method is async

[skip sauce]
---

diff --git a/docs/_includes/js/tabs.html b/docs/_includes/js/tabs.html
index 5ce8a766eb..033b424303 100644
--- a/docs/_includes/js/tabs.html
+++ b/docs/_includes/js/tabs.html
@@ -98,7 +98,7 @@ $('#myTabs li:eq(2) a').tab('show') // Select third tab (0-indexed)
   </p>
 
   <h4><code>.tab('show')</code></h4>
-  <p>Selects the given tab and shows its associated content. Any other tab that was previously selected becomes unselected and its associated content is hidden.</p>
+  <p>Selects the given tab and shows its associated content. Any other tab that was previously selected becomes unselected and its associated content is hidden. <strong>Returns to the caller before the tab pane has actually been shown</strong> (i.e. before the <code>shown.bs.tab</code> event occurs).</p>
   {% highlight js %}$('#someTab').tab('show'){% endhighlight %}
 
   <h3 id="tabs-events">Events</h3>