diff options
| author | Mark Otto <[email protected]> | 2012-09-26 16:02:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-26 16:02:33 -0700 |
| commit | ad96435d27de7661a158552ad088fd800fe66fe9 (patch) | |
| tree | c49fec334cfeb1f4ebf856f5d5c7ba53356309c9 /docs/javascript.html | |
| parent | cd5ae9e0304dfba17d445b0c2dac7b17a1faa201 (diff) | |
| parent | 24e277b85abace0f77076b1cfa96e11b1d1dc891 (diff) | |
| download | bootstrap-ad96435d27de7661a158552ad088fd800fe66fe9.tar.xz bootstrap-ad96435d27de7661a158552ad088fd800fe66fe9.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
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 0a757c2de..75901bc06 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -504,8 +504,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> @@ -802,7 +802,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> @@ -962,7 +962,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> |