From f836473129819c2e348f821ed268451b9b8bf2e4 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 2 Jun 2012 17:55:10 -0700
Subject: add html option back to tooltip and popover to explicitly prevent XSS
 #3421

---
 docs/javascript.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index fcdaccceb..28e8e6ffb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -771,6 +771,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>true</td>
                <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>
@@ -874,6 +880,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>true</td>
                <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>
-- 
cgit v1.2.3