From 2ad2954de63ca69184ba70cb42c22b595449449f Mon Sep 17 00:00:00 2001 From: tamtakoe Date: Mon, 24 Feb 2014 02:59:02 +0300 Subject: [PATCH] Fix transitionTimeout replace If tooltip hid two or more times in series next show canceled only last remove deferred and tooltip remove after show --- src/tooltip/tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js index da1b356799..562ced59f2 100644 --- a/src/tooltip/tooltip.js +++ b/src/tooltip/tooltip.js @@ -211,7 +211,7 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap // need to wait for it to expire beforehand. // FIXME: this is a placeholder for a port of the transitions library. if ( scope.tt_animation ) { - transitionTimeout = $timeout(removeTooltip, 500); + transitionTimeout = transitionTimeout ? transitionTimeout : $timeout(removeTooltip, 500); } else { removeTooltip(); }