mirror of
https://github.com/logseq/logseq.git
synced 2026-04-30 17:06:23 +00:00
Merge branch 'feat/db' into refactor/dsl-query
This commit is contained in:
@@ -104,8 +104,8 @@
|
||||
(.getType ^js (first clipboard-items)
|
||||
"web application/logseq"))))
|
||||
blocks-str (when blocks-blob (.text blocks-blob))]
|
||||
(when blocks-str
|
||||
(common-util/safe-read-map-string blocks-str))))
|
||||
(when blocks-str
|
||||
(common-util/safe-read-map-string blocks-str))))
|
||||
|
||||
(defn- markdown-blocks?
|
||||
[text]
|
||||
@@ -232,10 +232,11 @@
|
||||
(when id
|
||||
(let [clipboard-data (gobj/get e "clipboardData")
|
||||
files (.-files clipboard-data)]
|
||||
(when-let [file (first files)]
|
||||
(when-let [block (state/get-edit-block)]
|
||||
(editor-handler/upload-asset! id #js[file] (:block/format block)
|
||||
editor-handler/*asset-uploading? true)))
|
||||
(loop [files files]
|
||||
(when-let [file (first files)]
|
||||
(when-let [block (state/get-edit-block)]
|
||||
(editor-handler/upload-asset! id #js[file] (:block/format block) editor-handler/*asset-uploading? true))
|
||||
(recur (rest files))))
|
||||
(util/stop e))))
|
||||
|
||||
(defn editor-on-paste!
|
||||
|
||||
Reference in New Issue
Block a user