diff options
| author | Jacob Thornton <[email protected]> | 2012-06-02 17:55:10 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-06-02 17:55:10 -0700 |
| commit | f836473129819c2e348f821ed268451b9b8bf2e4 (patch) | |
| tree | 5acd7d92391310068375ab10145d3cb8194a1868 /docs/javascript.html | |
| parent | fc96bc8bba0687fb5845bffc72eb048535583499 (diff) | |
| download | bootstrap-f836473129819c2e348f821ed268451b9b8bf2e4.tar.xz bootstrap-f836473129819c2e348f821ed268451b9b8bf2e4.zip | |
add html option back to tooltip and popover to explicitly prevent XSS #3421
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index fcdaccceb..28e8e6ffb 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -772,6 +772,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>apply a css fade transition to the tooltip</td> </tr> <tr> + <td>html</td> + <td>boolean</td> + <td>true</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> <td>placement</td> <td>string|function</td> <td>'top'</td> @@ -875,6 +881,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>apply a css fade transition to the tooltip</td> </tr> <tr> + <td>html</td> + <td>boolean</td> + <td>true</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> <td>placement</td> <td>string|function</td> <td>'right'</td> |