diff options
| author | Mark Otto <[email protected]> | 2012-03-23 18:29:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-23 18:29:21 -0700 |
| commit | f87e4c60e9bb33f29bffed702af797b322821b8f (patch) | |
| tree | 64c0663ec3ef31ea3fedd9af6ed10826d10bcbc4 /docs/javascript.html | |
| parent | a57554222f091ed3905259b32d1f1a3786e37200 (diff) | |
| parent | b3bf223617754e658eb62ef0f068732e719a2c82 (diff) | |
| download | bootstrap-f87e4c60e9bb33f29bffed702af797b322821b8f.tar.xz bootstrap-f87e4c60e9bb33f29bffed702af797b322821b8f.zip | |
Merge branch '2.1.0-wip' into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 4f6059cb7..8728eb66d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -589,6 +589,21 @@ $('#myModal').on('hidden', function () { </tr> </tbody> </table> + <h3>Events</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th style="width: 150px;">Event</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>activate</td> + <td>This event fires whenever a new item becomes activated by the scrollspy.</td> + </tr> + </tbody> + </table> </div> </div> </section> @@ -1320,7 +1335,7 @@ $('#myCollapsible').on('hidden', function () { <td>interval</td> <td>number</td> <td>5000</td> - <td>The amount of time to delay between automatically cycling an item.</td> + <td>The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.</td> </tr> <tr> <td>pause</td> |