fix(tooltip): isOpen to work with expressions

The is-open attribute should work with expressions as well as model values Closes angular-ui#4380 Fixes angular-ui#4362
deskfed · Sep 30, 2015 · 4e74ee3 · 4e74ee3
1 parent 92fb6bf
commit 4e74ee3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/tooltip/test/tooltip.spec.js b/src/tooltip/test/tooltip.spec.js
@@ -350,6 +350,28 @@ describe('tooltip', function() {
     });
   });
 
+  describe('with an is-open attribute expression', function() {
+    beforeEach(inject(function ($compile) {
+      scope.isOpen = false;
+      elm = $compile(angular.element(
+        '<span tooltip="tooltip text" tooltip-is-open="isOpen === true" >Selector Text</span>'
+      ))(scope);
+      elmScope = elm.scope();
+      tooltipScope = elmScope.$$childTail;
+      scope.$digest();
+    }));
+
+    it('should show and hide with the expression', function() {
+      expect(tooltipScope.isOpen).toBe(false);
+      elmScope.isOpen = true;
+      elmScope.$digest();
+      expect(tooltipScope.isOpen).toBe(true);
+      elmScope.isOpen = false;
+      elmScope.$digest();
+      expect(tooltipScope.isOpen).toBe(false);
+    });
+  });
+
   describe('with a trigger attribute', function() {
     var scope, elmBody, elm, elmScope;
 

diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -221,7 +221,7 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position'])
 
               // And show the tooltip.
               ttScope.isOpen = true;
-              if (isOpenExp) {
+              if (isOpenExp && angular.isFunction(isOpenExp.assign)) {
                 isOpenExp.assign(ttScope.origScope, ttScope.isOpen);
               }
 
@@ -240,7 +240,7 @@ angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position'])
 
               // First things first: we don't show it anymore.
               ttScope.isOpen = false;
-              if (isOpenExp) {
+              if (isOpenExp && angular.isFunction(isOpenExp.assign)) {
                 isOpenExp.assign(ttScope.origScope, ttScope.isOpen);
               }