Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2012-06-03 04:55:10 +0400
committerJacob Thornton <jacobthornton@gmail.com>2012-06-03 04:55:10 +0400
commitf836473129819c2e348f821ed268451b9b8bf2e4 (patch)
tree5acd7d92391310068375ab10145d3cb8194a1868 /docs/javascript.html
parentfc96bc8bba0687fb5845bffc72eb048535583499 (diff)
add html option back to tooltip and popover to explicitly prevent XSS #3421
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index fcdaccceb0..28e8e6ffbd 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>