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:
authorJacob Thornton <jacobthornton@gmail.com>2012-10-18 09:27:00 +0400
committerJacob Thornton <jacobthornton@gmail.com>2012-10-18 09:27:00 +0400
commita2fc01444eda94963dce3ce845b9c76bfef363e5 (patch)
tree09ddbd17c08436fc2ca5c8c8e2cd8fe2f3a40c55 /js
parentedc3eee5eaae52384de1486639585c0b41318cf8 (diff)
parent21f29a76820d5ec2b38d1c41b859c8e5f41f4a62 (diff)
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to '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 d5c2def29f..a547b8a30e 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
}