From 0adb4e35f0d773caa6cff65a6f760001089c5ffb Mon Sep 17 00:00:00 2001 From: Lukasz Fiszer Date: Mon, 26 Aug 2013 20:57:47 +0200 Subject: [PATCH] Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js * events fire only after the CSS animation is completed * this fixes also events in popover.js (as it inherits from tooltip.js) --- js/tooltip.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/js/tooltip.js b/js/tooltip.js index 89802287a3..533f19b315 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -139,6 +139,7 @@ this.$element.trigger(e) if (e.isDefaultPrevented()) return + var that = this; var $tip = this.tip() @@ -188,7 +189,17 @@ var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) this.applyPlacement(calculatedOffset, placement) - this.$element.trigger('shown.bs.' + this.type) + + var complete = function() { + that.$element.trigger('shown.bs.' + that.type) + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one($.support.transition.end, complete) + .emulateTransitionEnd(150) : + complete() + } } @@ -262,6 +273,7 @@ function complete() { if (that.hoverState != 'in') $tip.detach() + that.$element.trigger('hidden.bs.' + that.type) } this.$element.trigger(e) @@ -276,8 +288,6 @@ .emulateTransitionEnd(150) : complete() - this.$element.trigger('hidden.bs.' + this.type) - return this }