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
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-tooltip.js2
-rw-r--r--js/tests/unit/bootstrap-tooltip.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 78dddbeade..5657204762 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 14d6b22745..964ba1ef26 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')