Skip to content

Commit a2fc014

Browse files
committed
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2 parents edc3eee + 21f29a7 commit a2fc014

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

js/bootstrap-tooltip.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
inside = /in/.test(placement)
120120

121121
$tip
122-
.remove()
122+
.detach()
123123
.css({ top: 0, left: 0, display: 'block' })
124124
.insertAfter(this.$element)
125125

@@ -166,18 +166,18 @@
166166

167167
function removeWithAnimation() {
168168
var timeout = setTimeout(function () {
169-
$tip.off($.support.transition.end).remove()
169+
$tip.off($.support.transition.end).detach()
170170
}, 500)
171171

172172
$tip.one($.support.transition.end, function () {
173173
clearTimeout(timeout)
174-
$tip.remove()
174+
$tip.detach()
175175
})
176176
}
177177

178178
$.support.transition && this.$tip.hasClass('fade') ?
179179
removeWithAnimation() :
180-
$tip.remove()
180+
$tip.detach()
181181

182182
return this
183183
}

0 commit comments

Comments
 (0)