fix($rootScope): Set no context when calling helper functions for $watch

When calling a $watch getter or listener, do not expose the inner workings with `this`. Closes: #13909
angular · Feb 1, 2016 · ab5c769 · ab5c769
1 parent 8969050
commit ab5c769
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
@@ -744,7 +744,7 @@ function $RootScopeProvider() {
        *
        */
       $digest: function() {
-        var watch, value, last,
+        var watch, value, last, fn, get,
             watchers,
             length,
             dirty, ttl = TTL,
@@ -790,15 +790,17 @@ function $RootScopeProvider() {
                   // Most common watches are on primitives, in which case we can short
                   // circuit it with === operator, only when === fails do we use .equals
                   if (watch) {
-                    if ((value = watch.get(current)) !== (last = watch.last) &&
+                    get = watch.get;
+                    if ((value = get(current)) !== (last = watch.last) &&
                         !(watch.eq
                             ? equals(value, last)
                             : (typeof value === 'number' && typeof last === 'number'
                                && isNaN(value) && isNaN(last)))) {
                       dirty = true;
                       lastDirtyWatch = watch;
                       watch.last = watch.eq ? copy(value, null) : value;
-                      watch.fn(value, ((last === initWatchVal) ? value : last), current);
+                      fn = watch.fn;
+                      fn(value, ((last === initWatchVal) ? value : last), current);
                       if (ttl < 5) {
                         logIdx = 4 - ttl;
                         if (!watchLog[logIdx]) watchLog[logIdx] = [];

diff --git a/test/ng/rootScopeSpec.js b/test/ng/rootScopeSpec.js
@@ -117,6 +117,20 @@ describe('Scope', function() {
     }));
 
 
+    it('should not expose the `inner working of watch', inject(function($rootScope) {
+      function Getter() {
+        expect(this).toBeUndefined();
+        return 'foo';
+      }
+      function Listener() {
+        expect(this).toBeUndefined();
+      }
+      if (msie < 10) return;
+      $rootScope.$watch(Getter, Listener);
+      $rootScope.$digest();
+    }));
+
+
     it('should watch and fire on expression change', inject(function($rootScope) {
       var spy = jasmine.createSpy();
       $rootScope.$watch('name.first', spy);