rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #13752 from twbs/fix-13268

Browse Source 
Proposed fix for #13268
This commit is contained in:
Chris Rebert 2014-06-07 18:03:49 -07:00
commit 2ca6581798
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
js/tests/unit/tooltip.js
View File

@ -118,9 +118,11 @@ $(function () {
test('should fire shown event', function () {
stop()
$('<div title="tooltip title"></div>')
var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
tooltip
.on('shown.bs.tooltip', function () {
ok(true, 'shown was called')
tooltip.remove()
start()
})
.bootstrapTooltip('show')
@ -142,12 +144,14 @@ $(function () {
test('should fire hide event', function () {
stop()
$('<div title="tooltip title"></div>')
var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hide.bs.tooltip', function () {
ok(true, 'hide was called')
tooltip.remove()
start()
})
.bootstrapTooltip('show')
@ -155,12 +159,14 @@ $(function () {
test('should fire hidden event', function () {
stop()
$('<div title="tooltip title"></div>')
var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hidden.bs.tooltip', function () {
ok(true, 'hidden was called')
tooltip.remove()
start()
})
.bootstrapTooltip('show')
@ -168,13 +174,15 @@ $(function () {
test('should not fire hidden event when default prevented', function () {
stop()
$('<div title="tooltip title"></div>')
var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hide.bs.tooltip', function (e) {
e.preventDefault()
ok(true, 'hide was called')
tooltip.remove()
start()
})
.on('hidden.bs.tooltip', function () {
@ -557,4 +565,31 @@ $(function () {
$('head #test').remove()
$('head #viewport-style').remove()
})
test('should not error when trying to show an auto-placed tooltip that has been removed from the dom', function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').appendTo('#qunit-fixture')
tooltip
.one('show.bs.tooltip', function () {
tooltip.remove()
})
.bootstrapTooltip({ placement: 'auto' })
var passed = true
try {
tooltip.bootstrapTooltip('show')
}
catch (err) {
passed = false
console.log(err)
}
ok(passed, '.tooltip(\'show\') should not throw an error in this case')
try {
tooltip.remove()
}
catch (err) {
// tooltip may have already been removed
}
})
})

5
js/tooltip.js
View File

@ -145,8 +145,9 @@
if (this.hasContent() && this.enabled) {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
var that = this;
var inDom = $.contains(document.documentElement, this.$element[0])
if (e.isDefaultPrevented() || !inDom) return
var that = this
var $tip = this.tip()