diff options
| author | Jacob Thornton <[email protected]> | 2013-07-23 18:44:08 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-23 18:44:08 -0700 |
| commit | f1009c19b31c24df871b97efa74e8e10791bb2c3 (patch) | |
| tree | 2bac5a675e252d6bf81fe6d17f345de508c0f313 /js/tooltip.js | |
| parent | 43e5e90a6d871dbbca2ac68429324719692777d3 (diff) | |
| download | bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.tar.xz bootstrap-f1009c19b31c24df871b97efa74e8e10791bb2c3.zip | |
revert collapse change + add emulateTransitionEvent to catch dead css transitions
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 1f84b5cf5..f8ba0aacb 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -238,19 +238,10 @@ $tip.removeClass('in') - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : + $tip + .one($.support.transition.end, $tip.detach) + .emulateTransitionEnd(150) : $tip.detach() this.$element.trigger('hidden.bs.' + this.type) |