diff options
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/javascript.html b/javascript.html index c3a6b0a32..db3053f22 100644 --- a/javascript.html +++ b/javascript.html @@ -478,9 +478,42 @@ $('.dropdown-toggle').dropdown() <h3>Methods</h3> <h4>$().dropdown('toggle')</h4> <p>Toggles the dropdown menu of a given navbar or tabbed navigation.</p> - </div> - + <h3>Events</h3> + <div class="bs-table-scrollable"> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th style="width: 150px;">Event Type</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>show.bs.dropdown</td> + <td>This event fires immediately when the show instance method is called.</td> + </tr> + <tr> + <td>shown.bs.dropdown</td> + <td>This event is fired when the dropdown has been made visible to the user (will wait for CSS transitions, to complete).</td> + </tr> + <tr> + <td>hide.bs.dropdown</td> + <td>This event is fired immediately when the hide instance method has been called.</td> + </tr> + <tr> + <td>hidden.bs.dropdown</td> + <td>This event is fired when the dropdown has finished being hidden from the user (will wait for CSS transitions, to complete).</td> + </tr> + </tbody> + </table> + </div><!-- ./bs-table-scrollable --> +{% highlight js %} +$('#myDropdown').on('show.bs.dropdown', function () { + // do something… +}) +{% endhighlight %} + </div> <!-- ScrollSpy ================================================== --> @@ -1144,14 +1177,14 @@ $('#myPopover').on('hidden.bs.popover', function () { <p>Add dismiss functionality to all alert messages with this plugin.</p> <div class="bs-example"> <div class="alert fade in"> - <button type="button" class="close" data-dismiss="alert">×</button> + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. </div> </div><!-- /example --> <div class="bs-example"> <div class="alert alert-block alert-error fade in"> - <button type="button" class="close" data-dismiss="alert">×</button> + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <h4>Oh snap! You got an error!</h4> <p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p> <p> @@ -1167,7 +1200,7 @@ $('#myPopover').on('hidden.bs.popover', function () { <h3>Markup</h3> <p>Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.</p> - {% highlight html %}<a class="close" data-dismiss="alert" href="#">×</a>{% endhighlight %} + {% highlight html %}<a class="close" data-dismiss="alert" href="#" aria-hidden="true">×</a>{% endhighlight %} <h3>Methods</h3> |