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

Merge branch 'develop' into feature/test-slimmerjs

This commit is contained in:
Stuart Mitchell 2015-03-11 16:21:34 +13:00
parent b98feca0e4 4426ed278b
commit ce1e6736d9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/re_frame/undo.cljs
View File

@ -36,7 +36,8 @@
(reset! undo-list []) (reset! undo-list [])
(reset! redo-list []) (reset! redo-list [])
(reset! undo-explain-list []) (reset! undo-explain-list [])
(reset! redo-explain-list [])) (reset! redo-explain-list [])
(reset! app-explain ""))
(defn store-now! (defn store-now!
@ -60,6 +61,13 @@
[] []
(pos? (count @redo-list))) (pos? (count @redo-list)))
(defn undo-explanations
"return list of undo descriptions or empty list if no undos"
[]
(if (undos?)
(conj @undo-explain-list @app-explain)
[]))
;; -- subscriptions ----------------------------------------------------------------------------- ;; -- subscriptions -----------------------------------------------------------------------------
(subs/register (subs/register
@ -82,7 +90,7 @@
(fn handler (fn handler
; "return a vector of string explanations ordered oldest to most recent" ; "return a vector of string explanations ordered oldest to most recent"
[_ _] [_ _]
(reaction (conj @undo-explain-list @app-explain)))) (reaction (undo-explanations))))
(subs/register (subs/register
:redo-explanations :redo-explanations