Skip to content

Commit 17566fa

Browse files
committed
Merge pull request twbs#16747 from twbs/doc-collapse-async-16746
Document that Collapse & Tab methods are async
2 parents 9227631 + ef02c55 commit 17566fa

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/_includes/js/collapse.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ <h4><code>.collapse(options)</code></h4>
229229
{% endhighlight %}
230230

231231
<h4><code>.collapse('toggle')</code></h4>
232-
<p>Toggles a collapsible element to shown or hidden.</p>
232+
<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>
233233

234234
<h4><code>.collapse('show')</code></h4>
235-
<p>Shows a collapsible element.</p>
235+
<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>
236236

237237
<h4><code>.collapse('hide')</code></h4>
238-
<p>Hides a collapsible element.</p>
238+
<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>
239239

240240
<h3 id="collapse-events">Events</h3>
241241
<p>Bootstrap's collapse class exposes a few events for hooking into collapse functionality.</p>

docs/_includes/js/tabs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ <h4><code>$().tab</code></h4>
9898
</p>
9999

100100
<h4><code>.tab('show')</code></h4>
101-
<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>
101+
<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>
102102
{% highlight js %}$('#someTab').tab('show'){% endhighlight %}
103103

104104
<h3 id="tabs-events">Events</h3>

0 commit comments

Comments
 (0)