status-im
/
reagent
mirror of https://github.com/status-im/reagent.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

on-dispose should always be called in Reaction

This commit is contained in:
Dan Holmsand 2015-09-18 17:59:40 +02:00
parent 897b766624
commit 6f448f296f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/reagent/ratom.cljs
View File

@ -121,7 +121,7 @@
(dissoc cached-reactions key)) (dissoc cached-reactions key))
(when (some? obj) (when (some? obj)
(set! (.-reaction obj) nil)) (set! (.-reaction obj) nil))
(when (some-> destroy .-destroy) (when (some-> destroy .-destroy some?)
(.destroy destroy)))) (.destroy destroy))))
v (-deref r)] v (-deref r)]
(set! cached-reactions (assoc cached-reactions key r)) (set! cached-reactions (assoc cached-reactions key r))
@ -129,7 +129,7 @@
(set! (.-reaction obj) r)) (set! (.-reaction obj) r))
v) v)
(let [res (f)] (let [res (f)]
(when (some-> destroy .-destroy) (when (some-> destroy .-destroy some?)
(.destroy destroy)) (.destroy destroy))
res)))) res))))
@ -401,14 +401,19 @@
IDeref IDeref
(-deref [this] (-deref [this]
(-check-clean this) (-check-clean this)
(if (and (nil? auto-run) (nil? *ratom-context*)) (if (and (nil? *ratom-context*)
(when-not (== dirtyness clean) (nil? auto-run))
(let [oldstate state (do
newstate (f)] (when-not (== dirtyness clean)
(set! state newstate) (let [oldstate state
(when (and (some? watches) newstate (f)]
(not= oldstate newstate)) (set! state newstate)
(-notify-watches this oldstate newstate)))) (when (and (some? watches)
(not= oldstate newstate))
(-notify-watches this oldstate newstate))))
(when (and (some? on-dispose)
(nil? watches))
(on-dispose)))
(do (do
(notify-deref-watcher! this) (notify-deref-watcher! this)
(when-not (== dirtyness clean) (when-not (== dirtyness clean)