clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 18:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-wrong-logbook-creation' of github.com:logseq/logseq into fix-wrong-logbook-creation

Browse Source
This commit is contained in:
llcc
2022-03-02 11:02:55 +08:00
parent 31d6552481 d7d7e94928
commit e0669bf001
33 changed files with 487 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -765,20 +765,28 @@
content))
(defn check
[{:block/keys [marker content repeated?] :as block}]
[{:block/keys [marker content repeated? uuid] :as block}]
(let [new-content (string/replace-first content marker "DONE")
new-content (if repeated?
(update-timestamps-content! block content)
new-content)]
(save-block-if-changed! block new-content)))
new-content)
input-id (state/get-edit-input-id)]
(if (and input-id
(string/ends-with? input-id (str uuid)))
(state/set-edit-content! input-id new-content)
(save-block-if-changed! block new-content))))
(defn uncheck
[{:block/keys [content] :as block}]
[{:block/keys [content uuid] :as block}]
(let [marker (if (= :now (state/get-preferred-workflow))
"LATER"
"TODO")
new-content (string/replace-first content "DONE" marker)]
(save-block-if-changed! block new-content)))
new-content (string/replace-first content "DONE" marker)
input-id (state/get-edit-input-id)]
(if (and input-id
(string/ends-with? input-id (str uuid)))
(state/set-edit-content! input-id new-content)
(save-block-if-changed! block new-content))))
(defn set-marker
[{:block/keys [marker content format] :as block} new-marker]
@@ -1046,13 +1054,15 @@
value (str value)]
(when-let [block (db/pull [:block/uuid block-id])]
(let [{:block/keys [content]} block
content (or (state/get-edit-content) content)
content (or content (state/get-edit-content))
new-content (-> (text/remove-timestamp content key)
(text/add-timestamp key value))]
(when (not= content new-content)
(if-let [input-id (state/get-edit-input-id)]
(state/set-edit-content! input-id new-content)
(save-block-if-changed! block new-content)))))))
(let [input-id (state/get-edit-input-id)]
(if (and input-id
(string/ends-with? input-id (str block-id)))
(state/set-edit-content! input-id new-content)
(save-block-if-changed! block new-content))))))))
(defn- set-blocks-id!
[block-ids]