Browse Source

Use media links for img in post-process (#10515) (#11504)

* use media links for img in post-process

* do not visit text of anchors
tags/v1.11.6
zeripath 4 years ago
parent
commit
1b62916393
No account linked to committer's email address
1 changed files with 29 additions and 5 deletions
  1. 29
    5
      modules/markup/html.go

+ 29
- 5
modules/markup/html.go View File

} }


for _, node := range nodes { for _, node := range nodes {
ctx.visitNode(node)
ctx.visitNode(node, true)
} }


// Create buffer in which the data will be placed again. We know that the // Create buffer in which the data will be placed again. We know that the
return res, nil return res, nil
} }


func (ctx *postProcessCtx) visitNode(node *html.Node) {
func (ctx *postProcessCtx) visitNode(node *html.Node, visitText bool) {
// Add user-content- to IDs if they don't already have them // Add user-content- to IDs if they don't already have them
for idx, attr := range node.Attr { for idx, attr := range node.Attr {
if attr.Key == "id" && !(strings.HasPrefix(attr.Val, "user-content-") || blackfridayExtRegex.MatchString(attr.Val)) { if attr.Key == "id" && !(strings.HasPrefix(attr.Val, "user-content-") || blackfridayExtRegex.MatchString(attr.Val)) {
// We ignore code, pre and already generated links. // We ignore code, pre and already generated links.
switch node.Type { switch node.Type {
case html.TextNode: case html.TextNode:
ctx.textNode(node)
if visitText {
ctx.textNode(node)
}
case html.ElementNode: case html.ElementNode:
if node.Data == "a" || node.Data == "code" || node.Data == "pre" {
if node.Data == "img" {
attrs := node.Attr
for idx, attr := range attrs {
if attr.Key != "src" {
continue
}
link := []byte(attr.Val)
if len(link) > 0 && !IsLink(link) {
prefix := ctx.urlPrefix
if ctx.isWikiMarkdown {
prefix = util.URLJoin(prefix, "wiki", "raw")
}
prefix = strings.Replace(prefix, "/src/", "/media/", 1)

lnk := string(link)
lnk = util.URLJoin(prefix, lnk)
link = []byte(lnk)
}
node.Attr[idx].Val = string(link)
}
} else if node.Data == "a" {
visitText = false
} else if node.Data == "code" || node.Data == "pre" {
return return
} }
for n := node.FirstChild; n != nil; n = n.NextSibling { for n := node.FirstChild; n != nil; n = n.NextSibling {
ctx.visitNode(n)
ctx.visitNode(n, visitText)
} }
} }
// ignore everything else // ignore everything else

Loading…
Cancel
Save