Merge pull request angular-ui#3169 from Hypercubed/master

fix(tooltip): Fix for issue angular-ui#3167
yarl · Jan 8, 2015 · 0938d3f · 0938d3f
2 parents f671e02 + 1ac9646
commit 0938d3f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -266,6 +266,12 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
                 hide();
               }
             });
+
+            attrs.$observe( 'disabled', function ( val ) {
+              if (val && ttScope.isOpen ) {
+                hide();
+              }
+            });
 
             attrs.$observe( prefix+'Title', function ( val ) {
               ttScope.title = val;