diff options
| author | Mark Otto <[email protected]> | 2012-02-26 23:16:11 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-26 23:16:11 -0800 |
| commit | 1a781a707e0785a1abd079a9c29628b0d8d1867d (patch) | |
| tree | a38c6b8485d24e8df50ede805084ba083e2df9a0 /docs/javascript.html | |
| parent | ccf7697185488850e7450bfb05092bebc2004084 (diff) | |
| parent | 43760eb2029c73b6be6b0dbeb753be1e247697d9 (diff) | |
| download | bootstrap-1a781a707e0785a1abd079a9c29628b0d8d1867d.tar.xz bootstrap-1a781a707e0785a1abd079a9c29628b0d8d1867d.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 4f40934f7..c64a85b53 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1310,6 +1310,12 @@ $('#myCollapsible').on('hidden', function () { <td>5000</td> <td>The amount of time to delay between automatically cycling an item.</td> </tr> + <tr> + <td>pause</td> + <td>string</td> + <td>"hover"</td> + <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td> + </tr> </tbody> </table> <h3>Markup</h3> |