Simplify logic to check for dependency changes during awake

knockout · Oct 1, 2017 · 3949c3e · 3949c3e
1 parent 195cdea
commit 3949c3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/spec/pureComputedBehaviors.js b/spec/pureComputedBehaviors.js
@@ -383,7 +383,6 @@ describe('Pure Computed', function() {
     });
 
     it('Should wake with the correct value when a chained pure computed has side effects for its awake event', function () {
-
         var observableToUpdateOnAwake = ko.observable(null),
             computed1 = ko.pureComputed(observableToUpdateOnAwake),
             computed2 = ko.pureComputed(computed1);
@@ -396,11 +395,8 @@ describe('Pure Computed', function() {
         // ignore side-effects from the awake callback of chained pure computeds
         computed2();
 
-        computed2.subscribe(function () {
-        });
-
+        computed2.subscribe(function () {});
         expect(computed2()).toEqual('foo');
-
     });
 
     describe('Should maintain order of subscriptions', function () {

diff --git a/src/subscribables/dependentObservable.js b/src/subscribables/dependentObservable.js
@@ -435,14 +435,11 @@ var pureComputedOverrides = {
                     subscription._version = dependency._version;
                     state.dependencyTracking[id] = subscription;
                 });
-            }
-
-            // Repeat check since waking dependencies may have triggered effects
-            if (computedObservable.haveDependenciesChanged()) {
-                state.dependencyTracking = null;
-                state.dependenciesCount = 0;
-                if (computedObservable.evaluateImmediate()) {
-                    computedObservable.updateVersion();
+                // Waking dependencies may have triggered effects
+                if (computedObservable.haveDependenciesChanged()) {
+                    if (computedObservable.evaluateImmediate()) {
+                        computedObservable.updateVersion();
+                    }
                 }
             }