Update ui-bootstrap-tpls.js

Fix to issue angular-ui/bootstrap#2785.
VitalyVoroshilov · Oct 6, 2014 · 677229e · 677229e
1 parent 49aa073
commit 677229e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ui-bootstrap-tpls.js b/ui-bootstrap-tpls.js
@@ -2576,7 +2576,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.