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

refactor: simplify dummy node

Browse Source
This commit is contained in:
Tienson Qin
2021-04-07 20:17:43 +08:00
parent 9e1b5beb9d
commit 38b0ecae46
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/frontend/handler/block.cljs
View File

@@ -66,34 +66,20 @@
([blocks format default-option {:keys [journal? page-name]
:or {journal? false}}]
(let [format (or format (state/get-preferred-format) :markdown)
blocks (if (and journal?
(seq blocks)
(when-let [title (second (first (:block/title (first blocks))))]
(date/valid-journal-title? title)))
(rest blocks)
blocks)
blocks (vec blocks)]
(cond
(and (seq blocks)
(or (and (> (count blocks) 1)
(:block/pre-block? (first blocks)))
(and (>= (count blocks) 1)
(not (:block/pre-block? (first blocks))))))
(if (seq blocks)
blocks
:else
(let [last-block (last blocks)
page-block (db/entity [:block/name (string/lower-case page-name)])
(let [page-block (when page-name (db/entity [:block/name (string/lower-case page-name)]))
page-id {:db/id (:db/id page-block)}
dummy (merge last-block
{:block/uuid (db/new-block-id)
dummy (merge {:block/uuid (db/new-block-id)
:block/left page-id
:block/parent page-id
:block/title ""
:block/content ""
:block/format format}
:block/format format
:block/dummy? true}
default-option)]
(conj blocks dummy))))))
[dummy])))))
(defn filter-blocks
[repo ref-blocks filters group-by-page?]