diff options
| author | Chris Rebert <[email protected]> | 2013-11-21 15:40:12 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-11-21 15:40:12 -0800 |
| commit | 4c246c0117ea56cb10b91b635ff415ec20d9c97d (patch) | |
| tree | bb259a9042a52f6b4920186bc1cb37a9aa073aca | |
| parent | ccd564650abd7024e81b69311c1f6bf75e1e9bab (diff) | |
| parent | afbdc21def8cf451e73895a6e2594e3dfa0a64e5 (diff) | |
| download | bootstrap-4c246c0117ea56cb10b91b635ff415ec20d9c97d.tar.xz bootstrap-4c246c0117ea56cb10b91b635ff415ec20d9c97d.zip | |
Merge pull request #11534 from twbs/doc-async-modals
document that modal show()/hide() return before animation finishes
| -rw-r--r-- | javascript.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/javascript.html b/javascript.html index 06a5f4570..a6c3344f8 100644 --- a/javascript.html +++ b/javascript.html @@ -304,15 +304,15 @@ $('#myModal').modal({ {% endhighlight %} <h4>.modal('toggle')</h4> - <p>Manually toggles a modal.</p> + <p>Manually toggles a modal. <strong>Returns to the caller before the modal has actually been shown or hidden</strong> (i.e. before the <code>shown.bs.modal</code> or <code>hidden.bs.modal</code> event occurs).</p> {% highlight js %}$('#myModal').modal('toggle'){% endhighlight %} <h4>.modal('show')</h4> - <p>Manually opens a modal.</p> + <p>Manually opens a modal. <strong>Returns to the caller before the modal has actually been shown</strong> (i.e. before the <code>shown.bs.modal</code> event occurs).</p> {% highlight js %}$('#myModal').modal('show'){% endhighlight %} <h4>.modal('hide')</h4> - <p>Manually hides a modal.</p> + <p>Manually hides a modal. <strong>Returns to the caller before the modal has actually been hidden</strong> (i.e. before the <code>hidden.bs.modal</code> event occurs).</p> {% highlight js %}$('#myModal').modal('hide'){% endhighlight %} <h3>Events</h3> |
