add html option back to tooltip and popover to explicitly prevent XSS #3421

1 files changed, 12 insertions, 0 deletions

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c50fb0b7a..568a6c474 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -694,6 +694,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}apply a css fade transition to the tooltip{{/i}}</td>
              </tr>
              <tr>
+               <td>{{_i}}html{{/i}}</td>
+               <td>{{_i}}boolean{{/i}}</td>
+               <td>true</td>
+               <td>{{_i}}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.{{/i}}</td>
+             </tr>
+             <tr>
                <td>{{_i}}placement{{/i}}</td>
                <td>{{_i}}string|function{{/i}}</td>
                <td>'top'</td>
@@ -797,6 +803,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}apply a css fade transition to the tooltip{{/i}}</td>
              </tr>
              <tr>
+               <td>{{_i}}html{{/i}}</td>
+               <td>{{_i}}boolean{{/i}}</td>
+               <td>true</td>
+               <td>{{_i}}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.{{/i}}</td>
+             </tr>
+             <tr>
                <td>{{_i}}placement{{/i}}</td>
                <td>{{_i}}string|function{{/i}}</td>
                <td>'right'</td>