diff options
| author | Mark Otto <[email protected]> | 2011-09-10 13:18:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-10 13:18:24 -0700 |
| commit | 6d99ae56591f94327453f5dc51e3ce57c64cb831 (patch) | |
| tree | e996c95e344f6acb772f33f1f08606928bc43cb3 /docs | |
| parent | e5b4a1ced5aef8bd050b48873d3e74fb2dfe799e (diff) | |
| parent | 5bc455d3707b87960d32c0672f5afb3b31173ec8 (diff) | |
| download | bootstrap-6d99ae56591f94327453f5dc51e3ce57c64cb831.tar.xz bootstrap-6d99ae56591f94327453f5dc51e3ce57c64cb831.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/index.html b/docs/index.html index c9a51cd7c..42c548ea3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -21,7 +21,7 @@ <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> - <script src="assets/js/bootstrap-dropdown.js"></script> + <script src="../js/bootstrap-dropdown.js"></script> <script src="assets/js/application.js"></script> <script src="assets/js/application-scrollspy.js"></script> diff --git a/docs/javascript.html b/docs/javascript.html index 7d1c6d6ca..8a4636bb3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -89,12 +89,12 @@ $('#modal-content').modal({ <h4>modal:toggle</h4> <p> Toggle the modal open state.</p> <pre class="prettyprint linenums">$('#modal-content').trigger('modal:toggle')</pre> - <h4>modal:open</h4> + <h4>modal:show</h4> <p>Opens the modal.</p> - <pre class="prettyprint linenums">$('#modal-content').trigger('modal:open')</pre> - <h4>modal:close</h4> + <pre class="prettyprint linenums">$('#modal-content').trigger('modal:show')</pre> + <h4>modal:hide</h4> <p>Closes the modal.</p> - <pre class="prettyprint linenums">$('#modal-content').trigger('modal:close')</pre> + <pre class="prettyprint linenums">$('#modal-content').trigger('modal:hide')</pre> <h3>Demo</h3> <!-- sample modal content --> |