]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
add activate to scrollspy docs
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 20 Mar 2012 03:29:22 +0000 (20:29 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 20 Mar 2012 03:29:22 +0000 (20:29 -0700)
docs/assets/bootstrap.zip
docs/assets/js/bootstrap-scrollspy.js
docs/javascript.html
docs/templates/pages/javascript.mustache

index 1a07056b6c05c2398af988b5af035b98291cea0c..92ba97c6d7122ad7747a5887f701ae4c760640aa 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index b7ff907f715dfe7f41753ddd8b3d2f8a58461bd1..e0c74539e16bbff818aa7034e91300faf85468b0 100644 (file)
           .addClass('active')
 
         if ( active.parent('.dropdown-menu') )  {
-          active.closest('li.dropdown').addClass('active')
+          active = active.closest('li.dropdown').addClass('active')
         }
+
+        active.trigger('activate')
       }
 
   }
index 54177b56648d110cc3763ef989e20aa6e42baeaa..3ee6f795c876bf3057c5d57b262fe3a778a7a995 100644 (file)
@@ -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>
index 007974183199873cc17daf3870065dddafec7054..2de6962108337dc418007026f29f8d1678121021 100644 (file)
@@ -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>