From 6c752907f09a9ea889bcb3f14cde320797f0ac62 Mon Sep 17 00:00:00 2001
From: VitalyVoroshilov <vitekio@yandex.ru>
Date: Mon, 6 Oct 2014 12:55:26 +0400
Subject: [PATCH] Update tooltip.js

Fix to issue #2785.
---
 src/tooltip/tooltip.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
index de6d66dc16..9f800e6d4f 100644
--- a/src/tooltip/tooltip.js
+++ b/src/tooltip/tooltip.js
@@ -167,7 +167,10 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
             // Show the tooltip popup element.
             function show() {
 
-              popupTimeout = null;
+              if ( popupTimeout ) {
+                $timeout.cancel( popupTimeout );
+                popupTimeout = null;
+              }
 
               // If there is a pending remove transition, we must cancel it, lest the
               // tooltip be mysteriously removed.