mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-29 21:52:22 +01:00
Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
This commit is contained in:
commit
21f29a7682
8
js/bootstrap-tooltip.js
vendored
8
js/bootstrap-tooltip.js
vendored
@ -119,7 +119,7 @@
|
|||||||
inside = /in/.test(placement)
|
inside = /in/.test(placement)
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.remove()
|
.detach()
|
||||||
.css({ top: 0, left: 0, display: 'block' })
|
.css({ top: 0, left: 0, display: 'block' })
|
||||||
.insertAfter(this.$element)
|
.insertAfter(this.$element)
|
||||||
|
|
||||||
@ -166,18 +166,18 @@
|
|||||||
|
|
||||||
function removeWithAnimation() {
|
function removeWithAnimation() {
|
||||||
var timeout = setTimeout(function () {
|
var timeout = setTimeout(function () {
|
||||||
$tip.off($.support.transition.end).remove()
|
$tip.off($.support.transition.end).detach()
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|
||||||
$tip.one($.support.transition.end, function () {
|
$tip.one($.support.transition.end, function () {
|
||||||
clearTimeout(timeout)
|
clearTimeout(timeout)
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && this.$tip.hasClass('fade') ?
|
$.support.transition && this.$tip.hasClass('fade') ?
|
||||||
removeWithAnimation() :
|
removeWithAnimation() :
|
||||||
$tip.remove()
|
$tip.detach()
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user