diff options
| author | Jacob Thornton <[email protected]> | 2012-09-24 23:15:36 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-09-24 23:15:36 -0700 |
| commit | 003fcccceb869ac0420d542bac9860f5f32e68a1 (patch) | |
| tree | 794e2ccf4d8e2431cf0696900d1ff63b22cb0b7a /js | |
| parent | ebf94c53a5497ff6d2aa353027d3a2ac3b67b18a (diff) | |
| download | bootstrap-003fcccceb869ac0420d542bac9860f5f32e68a1.tar.xz bootstrap-003fcccceb869ac0420d542bac9860f5f32e68a1.zip | |
change tooltip/popover html default to false for xss safety net
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-tooltip.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-tooltip.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 78dddbead..565720476 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -269,7 +269,7 @@ , trigger: 'hover' , title: '' , delay: 0 - , html: true + , html: false } }(window.jQuery); diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index 14d6b2274..964ba1ef2 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -37,10 +37,11 @@ $(function () { tooltip.tooltip('hide') }) - test("should always allow html entities", function () { + test("should allow html entities", function () { $.support.transition = false var tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"></a>') .appendTo('#qunit-fixture') + .tooltip({html: true}) .tooltip('show') ok($('.tooltip b').length, 'b tag was inserted') |