github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 11:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2025-01-05 09:37:41 +08:00
commit bc5b2b2291
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/model/assets.go
View File

@ -1095,7 +1095,6 @@ func assetsLinkDestsInNode(node *ast.Node) (ret []string) {
if !util.IsAssetLinkDest([]byte(dest)) { if !util.IsAssetLinkDest([]byte(dest)) {
continue continue
} }
ret = append(ret, strings.TrimSpace(dest)) ret = append(ret, strings.TrimSpace(dest))
} }
} }
@ -1106,12 +1105,10 @@ func assetsLinkDestsInNode(node *ast.Node) (ret []string) {
if !util.IsAssetLinkDest([]byte(dest)) { if !util.IsAssetLinkDest([]byte(dest)) {
continue continue
} }
ret = append(ret, strings.TrimSpace(dest)) ret = append(ret, strings.TrimSpace(dest))
} }
} }
} }
} }
} else { } else {
if ast.NodeWidget == n.Type { if ast.NodeWidget == n.Type {
@ -1120,15 +1117,16 @@ func assetsLinkDestsInNode(node *ast.Node) (ret []string) {
// 兼容两种属性名 custom-data-assets 和 data-assets https://github.com/siyuan-note/siyuan/issues/4122#issuecomment-1154796568 // 兼容两种属性名 custom-data-assets 和 data-assets https://github.com/siyuan-note/siyuan/issues/4122#issuecomment-1154796568
dataAssets = n.IALAttr("data-assets") dataAssets = n.IALAttr("data-assets")
} }
if "" == dataAssets || !util.IsAssetLinkDest([]byte(dataAssets)) { if !util.IsAssetLinkDest([]byte(dataAssets)) {
return ast.WalkContinue return ast.WalkContinue
} }
ret = append(ret, dataAssets) ret = append(ret, dataAssets)
} else { // HTMLBlock/InlineHTML/IFrame/Audio/Video } else { // HTMLBlock/InlineHTML/IFrame/Audio/Video
dest := treenode.GetNodeSrcTokens(n) dest := treenode.GetNodeSrcTokens(n)
if "" != dest { if !util.IsAssetLinkDest([]byte(dest)) {
ret = append(ret, dest) return ast.WalkContinue
} }
ret = append(ret, dest)
} }
} }
return ast.WalkContinue return ast.WalkContinue

4
kernel/treenode/node.go
View File

@ -176,10 +176,6 @@ func GetNodeSrcTokens(n *ast.Node) (ret string) {
src := n.Tokens[index+len("src=\""):] src := n.Tokens[index+len("src=\""):]
if index = bytes.Index(src, []byte("\"")); 0 < index { if index = bytes.Index(src, []byte("\"")); 0 < index {
src = src[:bytes.Index(src, []byte("\""))] src = src[:bytes.Index(src, []byte("\""))]
if !util.IsAssetLinkDest(src) {
return
}
ret = strings.TrimSpace(string(src)) ret = strings.TrimSpace(string(src))
return return
} }