Mark computed as dirty after notifying beforeChange.

christianalfoni · Dec 29, 2013 · 27cac34 · 27cac34
1 parent 8c2a003
commit 27cac34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/spec/asyncBehaviors.js b/spec/asyncBehaviors.js
@@ -225,7 +225,8 @@ describe('Rate-limited', function() {
             var observable = ko.observable().extend({rateLimit:500});
             var notifySpy = jasmine.createSpy('notifySpy');
             observable.subscribe(notifySpy);
-            var beforeChangeSpy = jasmine.createSpy('beforeChangeSpy');
+            var beforeChangeSpy = jasmine.createSpy('beforeChangeSpy')
+                .andCallFake(function(value) {expect(observable()).toBe(value); });
             observable.subscribe(beforeChangeSpy, null, 'beforeChange');
 
             // Observable is changed, but notification is delayed
@@ -380,7 +381,8 @@ describe('Rate-limited', function() {
             var computed = ko.computed(function () { evalSpy(observable()); return observable(); }).extend({rateLimit:500});
             var notifySpy = jasmine.createSpy('notifySpy');
             computed.subscribe(notifySpy);
-            var beforeChangeSpy = jasmine.createSpy('beforeChangeSpy');
+            var beforeChangeSpy = jasmine.createSpy('beforeChangeSpy')
+                .andCallFake(function(value) {expect(computed()).toBe(value); });
             computed.subscribe(beforeChangeSpy, null, 'beforeChange');
 
             // Observable is changed, but notification is delayed

diff --git a/src/subscribables/dependentObservable.js b/src/subscribables/dependentObservable.js
@@ -35,7 +35,6 @@ ko.dependentObservable = function (evaluatorFunctionOrOptions, evaluatorFunction
     }
 
     function evaluatePossiblyAsync() {
-        _needsEvaluation = true;
         var throttleEvaluationTimeout = dependentObservable['throttleEvaluation'];
         if (throttleEvaluationTimeout && throttleEvaluationTimeout >= 0) {
             clearTimeout(evaluationTimeoutInstance);
@@ -56,10 +55,6 @@ ko.dependentObservable = function (evaluatorFunctionOrOptions, evaluatorFunction
             return;
         }
 
-        if (!_needsEvaluation) {
-            return;
-        }
-
         if (disposeWhen && disposeWhen()) {
             // See comment below about _suppressDisposalUntilDisposeWhenReturnsFalse
             if (!_suppressDisposalUntilDisposeWhenReturnsFalse) {
@@ -190,6 +185,8 @@ ko.dependentObservable = function (evaluatorFunctionOrOptions, evaluatorFunction
         dependentObservable._evalRateLimited = function() {
             dependentObservable._rateLimitedBeforeChange(_latestValue);
 
+            _needsEvaluation = true;    // Mark as dirty
+
             // Pass the observable to the rate-limit code, which will access it when
             // it's time to do the notification.
             dependentObservable._rateLimitedChange(dependentObservable);