aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbilly gates <[email protected]>2012-10-17 22:15:48 -0700
committerbilly gates <[email protected]>2012-10-17 22:15:48 -0700
commit21f29a76820d5ec2b38d1c41b859c8e5f41f4a62 (patch)
tree1037a2f14dc945ee1fc2148dffed1a41d5f90fb9
parent8e6697f2b20da705377d2a7a2eb6957a4df59d77 (diff)
parentb892a373208fd17eb7b0123147715d3bf0a5b2ca (diff)
downloadbootstrap-21f29a76820d5ec2b38d1c41b859c8e5f41f4a62.tar.xz
bootstrap-21f29a76820d5ec2b38d1c41b859c8e5f41f4a62.zip
Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
-rw-r--r--js/bootstrap-tooltip.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index d5c2def29..a547b8a30 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -119,7 +119,7 @@
inside = /in/.test(placement)
$tip
- .remove()
+ .detach()
.css({ top: 0, left: 0, display: 'block' })
.insertAfter(this.$element)
@@ -166,18 +166,18 @@
function removeWithAnimation() {
var timeout = setTimeout(function () {
- $tip.off($.support.transition.end).remove()
+ $tip.off($.support.transition.end).detach()
}, 500)
$tip.one($.support.transition.end, function () {
clearTimeout(timeout)
- $tip.remove()
+ $tip.detach()
})
}
$.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() :
- $tip.remove()
+ $tip.detach()
return this
}