#104: current-state should return Derefable on :cljc
This commit is contained in:
parent
76e9a71a13
commit
c5f3e4cdf8
2 changed files with 12 additions and 12 deletions
|
|
@ -1,4 +1,4 @@
|
|||
(def +version+ "0.1.15")
|
||||
(def +version+ "0.1.16-SNAPSHOT")
|
||||
|
||||
(set-env!
|
||||
:source-paths #{"src"}
|
||||
|
|
|
|||
|
|
@ -60,17 +60,6 @@
|
|||
(stop))
|
||||
(swap! running dissoc state)))
|
||||
|
||||
#?(:clj
|
||||
(defn current-state [state]
|
||||
(let [{:keys [inst var]} (@meta-state state)]
|
||||
(if (= @mode :cljc)
|
||||
@inst
|
||||
(var-get var))))
|
||||
|
||||
:cljs
|
||||
(defn current-state [state]
|
||||
(-> (@meta-state state) :inst deref)))
|
||||
|
||||
#?(:clj
|
||||
(defn alter-state! [{:keys [var inst]} value]
|
||||
(if (= @mode :cljc)
|
||||
|
|
@ -140,6 +129,17 @@
|
|||
[_]
|
||||
(boolean ((running-states) name))))
|
||||
|
||||
#?(:clj
|
||||
(defn current-state [state]
|
||||
(let [{:keys [var]} (@meta-state state)]
|
||||
(if (= @mode :cljc)
|
||||
(->DerefableState state)
|
||||
(var-get var))))
|
||||
|
||||
:cljs
|
||||
(defn current-state [state]
|
||||
(-> (@meta-state state) :inst deref)))
|
||||
|
||||
(defn on-reload-meta [s-var]
|
||||
(or (-> s-var meta :on-reload)
|
||||
:restart)) ;; restart by default on ns reload
|
||||
|
|
|
|||
Loading…
Reference in a new issue