mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
change tooltip/popover html default to false for xss safety net
This commit is contained in:
parent
ebf94c53a5
commit
003fcccceb
5 changed files with 6 additions and 5 deletions
2
docs/assets/js/bootstrap-tooltip.js
vendored
2
docs/assets/js/bootstrap-tooltip.js
vendored
|
@ -269,7 +269,7 @@
|
|||
, trigger: 'hover'
|
||||
, title: ''
|
||||
, delay: 0
|
||||
, html: true
|
||||
, html: false
|
||||
}
|
||||
|
||||
}(window.jQuery);
|
||||
|
|
2
docs/assets/js/bootstrap.js
vendored
2
docs/assets/js/bootstrap.js
vendored
|
@ -1231,7 +1231,7 @@
|
|||
, trigger: 'hover'
|
||||
, title: ''
|
||||
, delay: 0
|
||||
, html: true
|
||||
, html: false
|
||||
}
|
||||
|
||||
}(window.jQuery);
|
||||
|
|
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
2
js/bootstrap-tooltip.js
vendored
2
js/bootstrap-tooltip.js
vendored
|
@ -269,7 +269,7 @@
|
|||
, trigger: 'hover'
|
||||
, title: ''
|
||||
, delay: 0
|
||||
, html: true
|
||||
, html: false
|
||||
}
|
||||
|
||||
}(window.jQuery);
|
||||
|
|
3
js/tests/unit/bootstrap-tooltip.js
vendored
3
js/tests/unit/bootstrap-tooltip.js
vendored
|
@ -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')
|
||||
|
|
Loading…
Reference in a new issue