kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge pull request #16747 from twbs/doc-collapse-async-16746

Browse source 
Document that Collapse & Tab methods are async
This commit is contained in:
Chris Rebert 2015-07-01 16:59:52 -07:00
commit 17566fa697
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/_includes/js/collapse.html
View file

@ -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>

2
docs/_includes/js/tabs.html
View file

@ -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>