clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 01:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gesture-support-on-block

Browse Source
This commit is contained in:
llcc
2022-05-25 15:16:45 +08:00
committed by GitHub
parent 3c816db7b2 df12a70016
commit db1777efa6
8 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,6 +590,7 @@
edit-block? true}}]
(when (or page block-uuid)
(let [before? (if page false before?)
sibling? (boolean sibling?)
sibling? (if before? true (if page false sibling?))
block (if page
(db/entity [:block/name (util/page-name-sanity-lc page)])
@@ -1288,21 +1289,23 @@
db-content (:block/content db-block)
db-content-without-heading (and db-content
(gp-util/safe-subs db-content (:block/level db-block)))
value (or (:block/content current-block)
(and elem (gobj/get elem "value")))]
(cond
force?
(save-block-aux! db-block value opts)
value (if (= (:block/uuid current-block) (:block/uuid block))
(:block/content current-block)
(and elem (gobj/get elem "value")))]
(when value
(cond
force?
(save-block-aux! db-block value opts)
(and skip-properties?
(db-model/top-block? block)
(when elem (thingatpt/properties-at-point elem)))
nil
(and skip-properties?
(db-model/top-block? block)
(when elem (thingatpt/properties-at-point elem)))
nil
(and block value db-content-without-heading
(not= (string/trim db-content-without-heading)
(string/trim value)))
(save-block-aux! db-block value opts)))
(and block value db-content-without-heading
(not= (string/trim db-content-without-heading)
(string/trim value)))
(save-block-aux! db-block value opts))))
(catch js/Error error
(log/error :save-block-failed error))))))))
@@ -2904,7 +2907,7 @@
(and (gp-util/url? text)
(not (string/blank? (util/get-selected-text))))
(html-link-format! text)
(and (text/block-ref? text)
(wrapped-by? input "((" "))"))
(commands/simple-insert! (state/get-edit-input-id) (text/get-block-ref text) nil)