Skip to content

Fix markdown image with link #4675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techknowlogick merged 6 commits into from
Oct 30, 2018
Merged

Fix markdown image with link #4675

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b0d525
Fix markdown image with link
LER0ever Aug 12, 2018
fdd8ceb
Add gitea copyright notice
LER0ever Aug 12, 2018
3b7d5ae
add a test for markdown image with link
LER0ever Aug 14, 2018
9a4015c
Merge branch 'master' into fix/md-image-links
techknowlogick Oct 30, 2018
faade68
remove svg related variables
LER0ever Oct 30, 2018
a3ba588
Merge branch 'master' into fix/md-image-links
techknowlogick Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions modules/markup/markdown/markdown.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ func (r *Renderer) Link(out *bytes.Buffer, link []byte, title []byte, content []
link = []byte(mLink)
}

r.Renderer.Link(out, link, title, content)
if len(content) > 10 && string(content[0:9]) == "<a href=\"" && bytes.Contains(content[9:], []byte("<img")) {
// Image with link case: markdown `[![]()]()`
// If the content is an image, then we change the original href around it
// which points to itself to a new address "link"
rightQuote := bytes.Index(content[9:], []byte("\""))
content = bytes.Replace(content, content[9:9+rightQuote], link, 1)
out.Write(content)
} else {
r.Renderer.Link(out, link, title, content)
}
}

// List renders markdown bullet or digit lists to HTML
Expand Down Expand Up @@ -104,22 +113,14 @@ func (r *Renderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byt
prefix = util.URLJoin(prefix, "wiki", "raw")
}
prefix = strings.Replace(prefix, "/src/", "/raw/", 1)
if len(link) > 0 {
if markup.IsLink(link) {
// External link with .svg suffix usually means CI status.
// TODO: define a keyword to allow non-svg images render as external link.
if bytes.HasSuffix(link, svgSuffix) || bytes.Contains(link, svgSuffixWithMark) {
Comment thread
lafriks marked this conversation as resolved.
r.Renderer.Image(out, link, title, alt)
return
}
} else {
lnk := string(link)
lnk = util.URLJoin(prefix, lnk)
lnk = strings.Replace(lnk, " ", "+", -1)
link = []byte(lnk)
}
if len(link) > 0 && !markup.IsLink(link) {
lnk := string(link)
lnk = util.URLJoin(prefix, lnk)
lnk = strings.Replace(lnk, " ", "+", -1)
link = []byte(lnk)
}

// Put a link around it pointint to ifself by default
out.WriteString(`<a href="`)
out.Write(link)
out.WriteString(`">`)
Expand Down