diff options
| author | Mark Otto <[email protected]> | 2012-09-26 16:01:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-26 16:01:59 -0700 |
| commit | 24e277b85abace0f77076b1cfa96e11b1d1dc891 (patch) | |
| tree | 238ff1628521cd0cb04ee2a0461a06a234249848 /docs/javascript.html | |
| parent | 498a28b4cd7ecfd5c02a7cb21f1d3a81e3e2d404 (diff) | |
| parent | 0540b63ab0a2f9359fbd34967fbb74402534573f (diff) | |
| download | bootstrap-24e277b85abace0f77076b1cfa96e11b1d1dc891.tar.xz bootstrap-24e277b85abace0f77076b1cfa96e11b1d1dc891.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 6c028e01e..ca03bb481 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -506,8 +506,8 @@ $('#myModal').on('hidden', function () { <p><em>None</em></p> <h3>Methods</h3> - <h4>$().dropdown()</h4> - <p>A programatic api for activating menus for a given navbar or tabbed navigation.</p> + <h4>$().dropdown('toggle')</h4> + <p>A programatic api for toggling menus for a given navbar or tabbed navigation.</p> </section> @@ -804,7 +804,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <tr> <td>html</td> <td>boolean</td> - <td>true</td> + <td>false</td> <td>Insert html into the tooltip. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.</td> </tr> <tr> @@ -964,7 +964,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <tr> <td>html</td> <td>boolean</td> - <td>true</td> + <td>false</td> <td>Insert html into the popover. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.</td> </tr> <tr> |