fix(chonge-detection): don't call reactionFn on deleted scope

dart-archive · Mar 11, 2014 · 0aacdc4 · 0aacdc4
1 parent 1ba5bef
commit 0aacdc4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/change_detection/watch_group.dart b/lib/change_detection/watch_group.dart
@@ -413,7 +413,6 @@ class RootWatchGroup extends WatchGroup {
     Watch dirtyWatch = _dirtyWatchHead;
     _dirtyWatchHead = null;
     RootWatchGroup root = _rootGroup;
-    root._removeCount = 0;
     try {
       while(dirtyWatch != null) {
         count++;
@@ -430,6 +429,7 @@ class RootWatchGroup extends WatchGroup {
       }
     } finally {
       _dirtyWatchTail = null;
+      root._removeCount = 0;
     }
     if (processStopwatch != null) processStopwatch..stop()..increment(count);
     return count;

diff --git a/test/core/scope_spec.dart b/test/core/scope_spec.dart
@@ -740,6 +740,18 @@ void main() {
         rootScope.apply();
         expect(log).toEqual(['root destroy', 'root2 destroy']);
       }));
+
+
+      it('should not call reaction fn when destroyed', inject((RootScope scope) {
+        var testScope = scope.createChild({});
+        bool called = false;
+        testScope.watch('items', (_, __) {
+          called = true;
+        });
+        testScope.destroy();
+        scope.apply();
+        expect(called).toBeFalsy();
+      }));
     });