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

Fix timestamps editing issues

pull/645/head
Tienson Qin 2020-10-23 20:04:38 +08:00
parent fb4a54bac1
commit 6d8ae0b268
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/main/frontend/components/datetime.cljs
View File

@ -112,6 +112,7 @@
[:p.mt-4
(ui/button "Submit"
:on-click (fn [e]
(util/stop e)
(let [block-data (state/get-timestamp-block)]
(let [{:keys [block typ show?]} block-data
block-id (or (:block/uuid (state/get-edit-block))

17
web/src/main/frontend/handler/editor.cljs
View File

@ -1026,7 +1026,10 @@
key (string/lower-case (str key))
value (str value)]
(when-let [block (db/pull [:block/uuid block-id])]
(let [{:block/keys [content scheduled deadline]} block
(let [{:block/keys [content scheduled deadline format]} block
content (or (when-let [edit-content (state/get-edit-content)]
(block/with-levels edit-content format block))
content)
new-line (str (string/upper-case key) ": " value)
new-content (cond
;; update
@ -1044,15 +1047,21 @@
;; insert
(or deadline? scheduled?)
(let [[title body] (util/split-first "\n" content)]
(let [[title body] (if (string/includes? content "\n")
(util/split-first "\n" content)
[content ""])]
(str title "\n"
new-line
"\n" body))
"\n" (util/trim-only-newlines body)))
:else
content)]
(when (not= content new-content)
(save-block-if-changed! block new-content))))))
(if-let [input-id (state/get-edit-input-id)]
(do
(prn {:input-id input-id})
(state/set-edit-content! input-id new-content))
(save-block-if-changed! block new-content)))))))
(defn copy-block-ref!
[block-id]