From 31b06375ef0bf325655b13f28dc47f226941f120 Mon Sep 17 00:00:00 2001 From: Dan Holmsand Date: Thu, 10 Sep 2015 16:06:53 +0200 Subject: [PATCH] Use run instead of deref --- src/reagent/ratom.cljs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/reagent/ratom.cljs b/src/reagent/ratom.cljs index 4fa47f5..09de49d 100644 --- a/src/reagent/ratom.cljs +++ b/src/reagent/ratom.cljs @@ -212,16 +212,14 @@ (set! ra.norun? true) (doseq [w ra.watching] (when (and (reaction? w) - (not (identical? (.-dirty? w) clean))) - (-deref w))) + (not (== (.-dirty? w) clean))) + (ra-check-clean w) + (when-not (== (.-dirty? w) clean) + (run w)))) (set! ra.norun? false) (when (== ra.dirty? maybe-dirty) (set! ra.dirty? clean)))) -(defn- ra-run-check [ra] - (binding [*ratom-context* (js-obj)] - (ra-check-clean ra))) - (defn- ra-handle-change [ra sender oldval newval] (when ra.active? (let [old-dirty ra.dirty?] @@ -232,9 +230,7 @@ is-dirty))) (if (and ra.auto-run (not ra.norun?)) (do - ;; FIXME: is this correct? - (when (== ra.dirty? maybe-dirty) - (ra-run-check ra)) + (ra-check-clean ra) (when-not (== ra.dirty? clean) ((or ra.auto-run run) ra))) (when (== old-dirty clean)