Merge branch 'master' into develop

This commit is contained in:
Mike Thompson 2016-09-06 12:04:16 +10:00
commit 2ccd95c397
1 changed files with 6 additions and 5 deletions

View File

@ -63,8 +63,9 @@
(re-frame/reg-cofx (re-frame/reg-cofx
:local-store-todos :local-store-todos
(fn [cofx _] (fn [cofx _]
"Read in todos from localstore, and process into a map we can merge into app-db." "Read in todos from localstore, and process into a map we can merge into app-db."
(assoc cofx :local-store-todos (assoc cofx :local-store-todos
(some->> (.getItem js/localStorage ls-key) (into (sorted-map)
(cljs.reader/read-string) ;; stored as an EDN map. (some->> (.getItem js/localStorage ls-key)
(into (sorted-map)))))) (cljs.reader/read-string) ;; stored as an EDN map.
)))))