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

fix: logbook editing

pull/2747/head
Tienson Qin 2021-08-31 00:59:23 +08:00
parent 3a98f92dff
commit ac64623ae8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/frontend/handler/editor.cljs
View File

@ -339,7 +339,9 @@
content (if (and (seq properties) real-content (not= real-content content))
(property/with-built-in-properties properties content format)
content)
content (drawer/with-logbook block content)
content (->> content
(drawer/remove-logbook)
(drawer/with-logbook block))
content (with-timetracking block content)
first-block? (= left page)
ast (mldoc/->edn (string/trim content) (mldoc/default-config format))
@ -800,11 +802,9 @@
(defn check
[{:block/keys [uuid marker content format repeated?] :as block}]
(let [new-content (string/replace-first content marker "DONE")
new-content (->
(if repeated?
(update-timestamps-content! block content)
new-content)
(with-marker-time block format "DONE" marker))]
new-content (if repeated?
(update-timestamps-content! block content)
new-content)]
(save-block-if-changed! block new-content)))
(defn uncheck
@ -812,8 +812,7 @@
(let [marker (if (= :now (state/get-preferred-workflow))
"LATER"
"TODO")
new-content (-> (string/replace-first content "DONE" marker)
(with-marker-time block format marker "DONE"))]
new-content (string/replace-first content "DONE" marker)]
(save-block-if-changed! block new-content)))
(defn cycle-todo!

2
src/main/frontend/ui.cljs
View File

@ -574,7 +574,7 @@
(rum/local false ::collapsed?)
{:will-mount (fn [state]
(let [args (:rum/args state)]
(when (true? (last args))
(when (true? (:default-collapsed? (last args)))
(reset! (get state ::collapsed?) true)))
state)}
[state header content {:keys [default-collapsed? title-trigger?]}]