diff options
| author | Mark Otto <[email protected]> | 2012-01-24 12:28:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 12:28:37 -0800 |
| commit | f32866c2fceee5b760d0647884b9e63be8ed8888 (patch) | |
| tree | 50fbb2dd0d3cbf39fafb9f9b24aaeeaff01f6aae /docs/javascript.html | |
| parent | e829001e5cb488a7708878b074205fc41e82fc82 (diff) | |
| parent | b5503c4c28d4f9d80f3285922376f0552808d40e (diff) | |
| download | bootstrap-f32866c2fceee5b760d0647884b9e63be8ed8888.tar.xz bootstrap-f32866c2fceee5b760d0647884b9e63be8ed8888.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 5a7c46b01..bdcc622de 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -914,7 +914,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>Closes an alert.</p> <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre> <h3>Events</h3> - <p>Bootstrap's alert class exposes a few events for hooking into alert functionality. </p> + <p>Bootstrap's alert class exposes a few events for hooking into alert functionality.</p> <table class="table table-bordered table-striped"> <thead> <tr> @@ -935,7 +935,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </table> <pre class="prettyprint linenums"> $('#my-alert').bind('closed', function () { - // do something ... + // do something… })</pre> </div> </div> @@ -1024,7 +1024,7 @@ $('#my-alert').bind('closed', function () { <h4>$().button('toggle')</h4> <p>Toggles push state. Gives btn the look that it's been activated.</p> <p><span class="label notice">Notice</span> You can enable auto toggling of a button by using the <code>data-toggle</code> attribute.</p> - <pre class="prettyprint linenums"><button class="btn" data-toggle="button" >...</button></pre> + <pre class="prettyprint linenums"><button class="btn" data-toggle="button" >…</button></pre> <h4>$().button('loading')</h4> <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>. </p> @@ -1166,7 +1166,7 @@ $('#myCollapsible').collapse({ </thead> <tbody> <tr> - <td>show</td> + <td>show/td> <td>This event fires immediately when the <code>show</code> instance method is called.</td> </tr> <tr> @@ -1188,7 +1188,7 @@ $('#myCollapsible').collapse({ <pre class="prettyprint linenums"> $('#myCollapsible').on('hidden', function () { - // do something ... + // do something… })</pre> </div> </div> @@ -1293,7 +1293,7 @@ $('.myCarousel').carousel({ <h4>.carousel('next')</h4> <p>Cycles to the next item.</p> <h3>Events</h3> - <p>Bootstrap's modal class exposes a few events for hooking into modal functionality. </p> + <p>Bootstrap's modal class exposes a few events for hooking into modal functionality.</p> <table class="table table-bordered table-striped"> <thead> <tr> |