mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 21:09:06 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.0-wip' into 2.0.3-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-03-23 18:29:21 -07:00
parent a57554222f b3bf223617
commit f87e4c60e9
19 changed files with 187 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
docs/javascript.html
View 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>
@@ -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>