From 8bd6619b7efa485b020fec96c76047e480469871 Mon Sep 17 00:00:00 2001
From: Paulo Scardine <paulos@xtend.com.br>
Date: Sun, 9 Jun 2013 23:16:26 -0300
Subject: [PATCH] fix(scope): watches can be safely unregistered inside watch
 handlers

Closes #2915
---
 src/ng/rootScope.js      |  2 +-
 test/ng/rootScopeSpec.js | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 4db38804ef21..f95d1c918e57 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -521,7 +521,7 @@ function $RootScopeProvider(){
                   watch = watchers[length];
                   // Most common watches are on primitives, in which case we can short
                   // circuit it with === operator, only when === fails do we use .equals
-                  if ((value = watch.get(current)) !== (last = watch.last) &&
+                  if (watch && (value = watch.get(current)) !== (last = watch.last) &&
                       !(watch.eq
                           ? equals(value, last)
                           : (typeof value == 'number' && typeof last == 'number'
diff --git a/test/ng/rootScopeSpec.js b/test/ng/rootScopeSpec.js
index 9d86c098cf30..15990c9606bc 100644
--- a/test/ng/rootScopeSpec.js
+++ b/test/ng/rootScopeSpec.js
@@ -330,6 +330,30 @@ describe('Scope', function() {
       expect(listener).not.toHaveBeenCalled();
     }));
 
+    it('should allow a watch to be unregistered while in a digest', inject(function($rootScope) {
+      var remove1, remove2;
+      $rootScope.$watch('remove', function() {
+        remove1();
+        remove2();
+      });
+      remove1 = $rootScope.$watch('thing', function() {});
+      remove2 = $rootScope.$watch('thing', function() {});
+      expect(function() {
+        $rootScope.$apply('remove = true');
+      }).not.toThrow();
+    }));
+
+    it('should allow a watch to be added while in a digest', inject(function($rootScope) {
+      var watch1 = jasmine.createSpy('watch1'),
+          watch2 = jasmine.createSpy('watch2');
+      $rootScope.$watch('foo', function() {
+        $rootScope.$watch('foo', watch1);
+        $rootScope.$watch('foo', watch2);
+      });
+      $rootScope.$apply('foo = true');
+      expect(watch1).toHaveBeenCalled();
+      expect(watch2).toHaveBeenCalled();
+    }));
 
     it('should not infinitely digest when current value is NaN', inject(function($rootScope) {
       $rootScope.$watch(function() { return NaN;});