diff options
| author | Jacob Thornton <[email protected]> | 2012-03-19 20:29:22 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-19 20:29:22 -0700 |
| commit | 07d23b927ee4eefdee51d4fcbffb3dece33be698 (patch) | |
| tree | 814640856025b0b1452eefb243b8c13d6ca42db2 /docs | |
| parent | 384a082e8d220115d0eb94b0c57d837b625ad2ab (diff) | |
| download | bootstrap-07d23b927ee4eefdee51d4fcbffb3dece33be698.tar.xz bootstrap-07d23b927ee4eefdee51d4fcbffb3dece33be698.zip | |
add activate to scrollspy docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55811 -> 55830 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-scrollspy.js | 4 | ||||
| -rw-r--r-- | docs/javascript.html | 15 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 15 |
4 files changed, 33 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 1a07056b6..92ba97c6d 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index b7ff907f7..e0c74539e 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -92,8 +92,10 @@ .addClass('active') if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') + active = active.closest('li.dropdown').addClass('active') } + + active.trigger('activate') } } diff --git a/docs/javascript.html b/docs/javascript.html index 54177b566..3ee6f795c 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> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 007974183..2de696210 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -513,6 +513,21 @@ $('#myModal').on('hidden', function () { </tr> </tbody> </table> + <h3>{{_i}}Events{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th style="width: 150px;">{{_i}}Event{{/i}}</th> + <th>{{_i}}Description{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td>{{_i}}activate{{/i}}</td> + <td>{{_i}}This event fires whenever a new item becomes activated by the scrollspy.{{/i}}</td> + </tr> + </tbody> + </table> </div> </div> </section> |