From 2172e2ea8a79f8c5d43863d83ff31b50abb391a0 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 18 Nov 2013 19:28:37 -0800
Subject: fix #11089: document modal show+shown events' relatedTarget property

---
 javascript.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 06a0bd021..06a5f4570 100644
--- a/javascript.html
+++ b/javascript.html
@@ -328,11 +328,11 @@ $('#myModal').modal({
         <tbody>
          <tr>
            <td>show.bs.modal</td>
-           <td>This event fires immediately when the <code>show</code> instance method is called.</td>
+           <td>This event fires immediately when the <code>show</code> instance method is called. If caused by a click, the clicked element is available as the <code>relatedTarget</code> property of the event.</td>
          </tr>
          <tr>
            <td>shown.bs.modal</td>
-           <td>This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete).</td>
+           <td>This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete). If caused by a click, the clicked element is available as the <code>relatedTarget</code> property of the event.</td>
          </tr>
          <tr>
            <td>hide.bs.modal</td>
@@ -346,8 +346,8 @@ $('#myModal').modal({
       </table>
     </div><!-- /.table-responsive -->
 {% highlight js %}
-$('#myModal').on('hidden.bs.modal', function () {
-  // do something…
+$('#myModal').on('hidden.bs.modal', function (e) {
+  // do something...
 })
 {% endhighlight %}
   </div>
-- 
cgit v1.2.3


From afbdc21def8cf451e73895a6e2594e3dfa0a64e5 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 18 Nov 2013 19:59:09 -0800
Subject: fixes part of #11117: doc that modal show()/hide() return before
 animation finishes

---
 javascript.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'javascript.html')

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>
-- 
cgit v1.2.3