greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: atom not derefed

pull/2747/head
Tienson Qin 2021-08-31 20:35:02 +08:00
parent fff5532e3f
commit 78f4cc35a4
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/frontend/components/diff.cljs
View File

@ -239,7 +239,7 @@
(reset! db-value nil)
state)}
[state repo path disk-content db-content]
(when (nil? disk-value)
(when (nil? @disk-value)
(reset! disk-value disk-content)
(reset! db-value db-content))
[:div.cp__diff-file {:style {:width 980}}
@ -271,28 +271,33 @@
[:div.mb-2 "On disk:"]
[:textarea.overflow-auto
{:value (rum/react disk-value)
:on-change (fn [e] (reset! disk-value (util/evalue e)))
:on-change (fn [e]
(reset! disk-value (util/evalue e)))
:style {:min-height "50vh"}}
disk-content]
(ui/button "Select this"
:on-click
(fn []
(when-let [value @disk-value]
(file/alter-file repo path @disk-value
{:re-render-root? true
:skip-compare? true})
:skip-compare? true}))
(state/close-modal!)))]
[:div.ml-4.flex-1
[:div.mb-2 "In Logseq:"]
[:textarea.overflow-auto
{:value (rum/react db-value)
:on-change (fn [e] (reset! db-value (util/evalue e)))
:on-change (fn [e]
(prn "new-value: " (util/evalue e))
(reset! db-value (util/evalue e)))
:style {:min-height "50vh"}}
db-content]
(ui/button "Select this"
:on-click
(fn []
(file/alter-file repo path @db-value
(when-let [value @db-value]
(file/alter-file repo path value
{:re-render-root? true
:skip-compare? true})
:skip-compare? true}))
(state/close-modal!)))]]]])