Skip to content

Commit c927891

Browse files
committed
Remove automatic alt text in markdown image rendering
1 parent c9b72d5 commit c927891

File tree

4 files changed

+45
-51
lines changed

4 files changed

+45
-51
lines changed

modules/markup/html.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,6 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
759759
title = path.Base(name)
760760
}
761761
alt := props["alt"]
762-
if alt == "" {
763-
alt = name
764-
}
765762

766763
// make the childNode an image - if we can, we also place the alt
767764
childNode.Type = html.ElementNode
@@ -772,9 +769,6 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
772769
{Key: "title", Val: title},
773770
{Key: "alt", Val: alt},
774771
}
775-
if alt == "" {
776-
childNode.Attr = childNode.Attr[:2]
777-
}
778772
} else {
779773
if !absoluteLink {
780774
if ctx.IsWiki {

modules/markup/html_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -416,36 +416,36 @@ func TestRender_ShortLinks(t *testing.T) {
416416
otherImgurlWiki := util.URLJoin(markup.TestRepoURL, "wiki", "raw", "Link+Other.jpg")
417417
encodedImgurlWiki := util.URLJoin(markup.TestRepoURL, "wiki", "raw", "Link+%23.jpg")
418418
notencodedImgurlWiki := util.URLJoin(markup.TestRepoURL, "wiki", "raw", "some", "path", "Link+#.jpg")
419-
favicon := "http://google.com/favicon.ico"
419+
favicon := "https://forgejo.org/favicon.ico"
420420

421421
test(
422422
"[[Link]]",
423423
`<p><a href="`+url+`" rel="nofollow">Link</a></p>`,
424424
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a></p>`)
425425
test(
426426
"[[Link.jpg]]",
427-
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Link.jpg" alt="Link.jpg"/></a></p>`,
428-
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Link.jpg" alt="Link.jpg"/></a></p>`)
427+
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Link.jpg" alt=""/></a></p>`,
428+
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Link.jpg" alt=""/></a></p>`)
429429
test(
430430
"[["+favicon+"]]",
431-
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico" alt="`+favicon+`"/></a></p>`,
432-
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico" alt="`+favicon+`"/></a></p>`)
431+
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico" alt=""/></a></p>`,
432+
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico" alt=""/></a></p>`)
433433
test(
434434
"[[Name|Link]]",
435435
`<p><a href="`+url+`" rel="nofollow">Name</a></p>`,
436436
`<p><a href="`+urlWiki+`" rel="nofollow">Name</a></p>`)
437437
test(
438438
"[[Name|Link.jpg]]",
439-
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Name" alt="Name"/></a></p>`,
440-
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Name" alt="Name"/></a></p>`)
439+
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Name" alt=""/></a></p>`,
440+
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Name" alt=""/></a></p>`)
441441
test(
442442
"[[Name|Link.jpg|alt=AltName]]",
443443
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="AltName" alt="AltName"/></a></p>`,
444444
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="AltName" alt="AltName"/></a></p>`)
445445
test(
446446
"[[Name|Link.jpg|title=Title]]",
447-
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt="Title"/></a></p>`,
448-
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Title" alt="Title"/></a></p>`)
447+
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt=""/></a></p>`,
448+
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Title" alt=""/></a></p>`)
449449
test(
450450
"[[Name|Link.jpg|alt=AltName|title=Title]]",
451451
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt="AltName"/></a></p>`,
@@ -472,16 +472,16 @@ func TestRender_ShortLinks(t *testing.T) {
472472
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a> <a href="`+otherURLWiki+`" rel="nofollow">Other Link</a> <a href="`+encodedURLWiki+`" rel="nofollow">Link?</a></p>`)
473473
test(
474474
"[[Link #.jpg]]",
475-
`<p><a href="`+encodedImgurl+`" rel="nofollow"><img src="`+encodedImgurl+`" title="Link #.jpg" alt="Link #.jpg"/></a></p>`,
476-
`<p><a href="`+encodedImgurlWiki+`" rel="nofollow"><img src="`+encodedImgurlWiki+`" title="Link #.jpg" alt="Link #.jpg"/></a></p>`)
475+
`<p><a href="`+encodedImgurl+`" rel="nofollow"><img src="`+encodedImgurl+`" title="Link #.jpg" alt=""/></a></p>`,
476+
`<p><a href="`+encodedImgurlWiki+`" rel="nofollow"><img src="`+encodedImgurlWiki+`" title="Link #.jpg" alt=""/></a></p>`)
477477
test(
478478
"[[Name|Link #.jpg|alt=\"AltName\"|title='Title']]",
479479
`<p><a href="`+encodedImgurl+`" rel="nofollow"><img src="`+encodedImgurl+`" title="Title" alt="AltName"/></a></p>`,
480480
`<p><a href="`+encodedImgurlWiki+`" rel="nofollow"><img src="`+encodedImgurlWiki+`" title="Title" alt="AltName"/></a></p>`)
481481
test(
482482
"[[some/path/Link #.jpg]]",
483-
`<p><a href="`+notencodedImgurl+`" rel="nofollow"><img src="`+notencodedImgurl+`" title="Link #.jpg" alt="some/path/Link #.jpg"/></a></p>`,
484-
`<p><a href="`+notencodedImgurlWiki+`" rel="nofollow"><img src="`+notencodedImgurlWiki+`" title="Link #.jpg" alt="some/path/Link #.jpg"/></a></p>`)
483+
`<p><a href="`+notencodedImgurl+`" rel="nofollow"><img src="`+notencodedImgurl+`" title="Link #.jpg" alt=""/></a></p>`,
484+
`<p><a href="`+notencodedImgurlWiki+`" rel="nofollow"><img src="`+notencodedImgurlWiki+`" title="Link #.jpg" alt=""/></a></p>`)
485485
test(
486486
"<p><a href=\"https://example.org\">[[foobar]]</a></p>",
487487
`<p><a href="https://example.org" rel="nofollow">[[foobar]]</a></p>`,

0 commit comments

Comments
 (0)