diff --git a/kernel/model/assets.go b/kernel/model/assets.go index c89d3e54f..75406fef1 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -1095,7 +1095,6 @@ func assetsLinkDestsInNode(node *ast.Node) (ret []string) { if !util.IsAssetLinkDest([]byte(dest)) { continue } - ret = append(ret, strings.TrimSpace(dest)) } } @@ -1106,12 +1105,10 @@ func assetsLinkDestsInNode(node *ast.Node) (ret []string) { if !util.IsAssetLinkDest([]byte(dest)) { continue } - ret = append(ret, strings.TrimSpace(dest)) } } } - } } else { 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 dataAssets = n.IALAttr("data-assets") } - if "" == dataAssets || !util.IsAssetLinkDest([]byte(dataAssets)) { + if !util.IsAssetLinkDest([]byte(dataAssets)) { return ast.WalkContinue } ret = append(ret, dataAssets) } else { // HTMLBlock/InlineHTML/IFrame/Audio/Video dest := treenode.GetNodeSrcTokens(n) - if "" != dest { - ret = append(ret, dest) + if !util.IsAssetLinkDest([]byte(dest)) { + return ast.WalkContinue } + ret = append(ret, dest) } } return ast.WalkContinue diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index d1069dad8..f0048e173 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -176,10 +176,6 @@ func GetNodeSrcTokens(n *ast.Node) (ret string) { src := n.Tokens[index+len("src=\""):] if index = bytes.Index(src, []byte("\"")); 0 < index { src = src[:bytes.Index(src, []byte("\""))] - if !util.IsAssetLinkDest(src) { - return - } - ret = strings.TrimSpace(string(src)) return }