github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-27 04:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved history deselection.

Browse Source
This commit is contained in:
Andrey Antukh 2016-03-27 18:45:58 +03:00
parent ea531ae620
commit d8cb4669e5
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/uxbox/data/pages.cljs
View File

@ -213,22 +213,30 @@
;; --- Select Page History
(defrecord SelectPageHistory [page history]
;; TODO: seems like it is inefficient packing the current
;; page every time, but a this moment it works. Maybe in
;; future it will need some refactor.
(defrecord SelectPageHistory [id history]
rs/UpdateEvent
(-apply-update [_ state]
(let [page (get-in state [:pages-by-id page])
page' (assoc page
:history true
:data (:data history)
:version (:version history))]
(-> state
(stpr/unpack-page page')
(assoc-in [:workspace :history :selected] (:id history))
(update-in [:workspace :history]
(fn [v]
(if (:current-version v)
v
(assoc v :current-version (:version page)))))))))
(if (nil? history)
(let [packed (get-in state [:workspace :history :current])]
(-> state
(stpr/unpack-page packed)
(assoc-in [:workspace :history :selected] nil)
(assoc-in [:workspace :history :current] nil)))
(let [packed (stpr/pack-page state id)
page (get-in state [:pages-by-id id])
page' (assoc page
:history true
:data (:data history)
:version (:version history))]
(-> state
(stpr/unpack-page page')
(assoc-in [:workspace :history :selected] (:id history))
(update-in [:workspace :history :current] (fnil identity packed)))))))
(defn select-page-history
[id history]

3
src/uxbox/ui/workspace/sidebar/history.cljs
View File

@ -57,7 +57,8 @@
(let [select #(rs/emit! (dpg/select-page-history (:id page) %))]
(html
[:ul.history-content
[:li {:class (when-not (:selected history) "current")}
[:li {:class (when-not (:selected history) "current")
:on-click (partial select nil)}
[:div.pin-icon i/pin]
[:span (str "Version " (:version page) " (current)")]]
(for [item (:items history)]