aboutsummaryrefslogtreecommitdiff
path: root/javascript
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-09-26 18:33:07 -0700
committerChris Rebert <[email protected]>2014-09-26 18:33:07 -0700
commitf5b90440fab072d6e694daf132fb6b569c5fb89b (patch)
treebf251399e4ba363584af28f2b2d480491daefe5c /javascript
parent55455720b261fae211fb4a29cf1b1fbd8405305b (diff)
downloadbootstrap-f5b90440fab072d6e694daf132fb6b569c5fb89b.tar.xz
bootstrap-f5b90440fab072d6e694daf132fb6b569c5fb89b.zip
Port JS Alert fixes over to hosted docs
Diffstat (limited to 'javascript')
-rw-r--r--javascript/index.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/javascript/index.html b/javascript/index.html
index 227515b8a..9fcee2260 100644
--- a/javascript/index.html
+++ b/javascript/index.html
@@ -1497,11 +1497,10 @@
<h3>Methods</h3>
<h4>$().alert()</h4>
- <p>Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the <code>.fade</code> and <code>.in</code> class already applied to them.</p>
+ <p>Makes an alert listen for click events on descendant elements which have the <code>data-dismiss="alert"</code> attribute. (Not necessary when using the data-api's auto-initialization.)</p>
- <h4>.alert('close')</h4>
- <p>Closes an alert.</p>
- <div class="highlight"><pre><code class="js"><span class="nx">$</span><span class="p">(</span><span class="s2">&quot;.alert&quot;</span><span class="p">).</span><span class="nx">alert</span><span class="p">(</span><span class="s1">&#39;close&#39;</span><span class="p">)</span></code></pre></div>
+ <h4>$().alert('close')</h4>
+ <p>Closes an alert by removing it from the DOM. If the <code>.fade</code> and <code>.in</code> classes are present on the element, the alert will fade out before it is removed.</p>
<h3>Events</h3>