aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/_includes/js/collapse.html6
-rw-r--r--docs/_includes/js/tabs.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/js/collapse.html b/docs/_includes/js/collapse.html
index 084bb4bad..6d856862a 100644
--- a/docs/_includes/js/collapse.html
+++ b/docs/_includes/js/collapse.html
@@ -229,13 +229,13 @@ $('#myCollapsible').collapse({
{% endhighlight %}
<h4><code>.collapse('toggle')</code></h4>
- <p>Toggles a collapsible element to shown or hidden.</p>
+ <p>Toggles a collapsible element to shown or hidden. <strong>Returns to the caller before the collapsible element has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.collapse</code> or <code>hidden.bs.collapse</code> event occurs).</p>
<h4><code>.collapse('show')</code></h4>
- <p>Shows a collapsible element.</p>
+ <p>Shows a collapsible element. <strong>Returns to the caller before the collapsible element has actually been shown</strong> (i.e. before the <code>shown.bs.collapse</code> event occurs).</p>
<h4><code>.collapse('hide')</code></h4>
- <p>Hides a collapsible element.</p>
+ <p>Hides a collapsible element. <strong>Returns to the caller before the collapsible element has actually been hidden</strong> (i.e. before the <code>hidden.bs.collapse</code> event occurs).</p>
<h3 id="collapse-events">Events</h3>
<p>Bootstrap's collapse class exposes a few events for hooking into collapse functionality.</p>
diff --git a/docs/_includes/js/tabs.html b/docs/_includes/js/tabs.html
index 5ce8a766e..033b42430 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>