fix(tooltip): Fix for issue angular-ui#3167

antoinepairet · Jan 8, 2015 · 22f61a6 · 22f61a6
1 parent eec68d8
commit 22f61a6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/tooltip/test/tooltip2.spec.js b/src/tooltip/test/tooltip2.spec.js
@@ -133,4 +133,16 @@ describe('tooltip directive', function () {
     expect(fragment).not.toHaveOpenTooltips();
   });
 
-});
+  it('should not show tooltips element is disabled (button) - issue #3167', function () {
+    var fragment = compileTooltip('<button tooltip="cancel!" ng-disabled="disabled" ng-click="disabled = true">Cancel</button>');
+
+    fragment.find('button').trigger( 'mouseenter' );
+    expect(fragment).toHaveOpenTooltips();
+
+    fragment.find('button').trigger( 'click' );
+    $timeout.flush();
+    // One needs to flush deferred functions before checking there is no tooltip.
+    expect(fragment).not.toHaveOpenTooltips();
+  });
+
+});
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -267,6 +267,12 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
               }
             });
 
+            attrs.$observe( 'disabled', function ( val ) {
+              if (val && ttScope.isOpen ) {
+                hide();
+              }
+            });
+
             attrs.$observe( prefix+'Title', function ( val ) {
               ttScope.title = val;
             });