diff options
| author | Mark Otto <[email protected]> | 2013-08-11 16:07:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-11 16:07:57 -0700 |
| commit | 83c236f5705822882e094d08e0bfa193d4e9f4ae (patch) | |
| tree | d40492c1297799c6e37f22b20e5eb123240164df /javascript.html | |
| parent | 1ff1dfb2bd031832c725c146deb8b7363cfeadf5 (diff) | |
| parent | 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 (diff) | |
| download | bootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.tar.xz bootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html index 253301807..c3a6b0a32 100644 --- a/javascript.html +++ b/javascript.html @@ -273,7 +273,7 @@ $('#myModal').on('show.bs.modal', function (e) { <td>remote</td> <td>path</td> <td>false</td> - <td><p>If a remote URL is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p> + <td><p>If a remote URL is provided, content will be loaded via jQuery's <code>load</code> method and injected into the root of the modal element. If you're using the data api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p> {% highlight html %} <a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a> {% endhighlight %} @@ -1722,6 +1722,12 @@ $('.carousel').carousel() <td>"hover"</td> <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td> </tr> + <tr> + <td>wrap</td> + <td>boolean</td> + <td>true</td> + <td>Whether the carousel should cycle continuously or have hard stops.</td> + </tr> </tbody> </table> </div><!-- /.bs-table-scrollable --> |