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

fix(editor): bad format copy from html

Browse Source 
- should keep space between tags
- should avoid raw data-url
This commit is contained in:
Andelf
2022-07-05 00:28:02 +08:00
committed by Tienson Qin
parent cc643f8487
commit e3b749e893
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/frontend/extensions/html_parser.cljs
View File

@@ -73,7 +73,7 @@
:else
nil)
children' (map-join children)]
(when-not (string/blank? children')
(when (not-empty children')
(str (if (string? pattern) pattern (apply str pattern))
children'
(if (string? pattern) pattern (apply str (reverse pattern)))))))
@@ -122,11 +122,15 @@
:org (util/format "[[%s][%s]]" href label)
nil))))
:img (let [src (:src attrs)
alt (or (:alt attrs) "")]
(case format
:markdown (util/format "![%s](%s)" alt src)
:org (util/format "[[%s][%s]]" src alt)
nil))
alt (or (:alt attrs) "")
;; reject url-encoded and utf8-encoded(svg)
unsafe-data-url? (and (string/starts-with? src "data:")
(not (re-find #"^data:.*?;base64," src)))]
(when-not unsafe-data-url?
(case format
:markdown (util/format "![%s](%s)" alt src)
:org (util/format "[[%s][%s]]" src alt)
nil)))
:p (util/format "%s"
(map-join children))
@@ -218,7 +222,7 @@
(for [x hiccup]
(single-hiccup-transform x))
(single-hiccup-transform hiccup))]
(string/replace (apply str result) #"\n\n+" "\n\n")))
(apply str result)))
(defn hiccup->doc
[format hiccup]
@@ -226,9 +230,8 @@
(if (string/blank? s)
""
(-> s
(string/trim)
(string/replace "\n\n\n\n" "\n\n")
(string/replace "\n\n\n" "\n\n")))))
string/trim
(string/replace #"\n\n+" "\n\n")))))
(defn html-decode-hiccup
[hiccup]