diff options
| author | silverwind <me@silverwind.io> | 2019-06-19 00:31:31 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-06-18 18:31:31 -0400 |
| commit | b209531959104cb6d5a8079ec567386720f3aaf3 (patch) | |
| tree | 572793a1f9721cc5d63d8348c71637dae658466a /modules | |
| parent | a205155e9d984f050eb081aa4904fad6a0598ab6 (diff) | |
| download | gitea-b209531959104cb6d5a8079ec567386720f3aaf3.tar.gz gitea-b209531959104cb6d5a8079ec567386720f3aaf3.zip | |
fix hljs unintenionally highlighting commit links (#7244)
* fix hljs unintenionally highlighting commit links
* fix unit tests
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/markup/html.go | 1 | ||||
| -rw-r--r-- | modules/markup/html_internal_test.go | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/markup/html.go b/modules/markup/html.go index dbfc8dbe85..3e976929c7 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -323,6 +323,7 @@ func createCodeLink(href, content string) *html.Node { code := &html.Node{ Type: html.ElementNode, Data: atom.Code.String(), + Attr: []html.Attribute{{Key: "class", Val: "nohighlight"}}, } code.AppendChild(text) diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 10bc4973cd..f0d894532b 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -197,13 +197,13 @@ func TestRender_AutoLink(t *testing.T) { // render valid commit URLs tmp := util.URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") - test(tmp, "<a href=\""+tmp+"\"><code>d8a994ef24</code></a>") + test(tmp, "<a href=\""+tmp+"\"><code class=\"nohighlight\">d8a994ef24</code></a>") tmp += "#diff-2" - test(tmp, "<a href=\""+tmp+"\"><code>d8a994ef24 (diff-2)</code></a>") + test(tmp, "<a href=\""+tmp+"\"><code class=\"nohighlight\">d8a994ef24 (diff-2)</code></a>") // render other commit URLs - tmp = "https://external-link.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2" - test(tmp, "<a href=\""+tmp+"\"><code>d8a994ef24 (diff-2)</code></a>") + tmp = "https://external-link.gitea.io/go-gitea/gitea/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2" + test(tmp, "<a href=\""+tmp+"\"><code class=\"nohighlight\">d8a994ef24 (diff-2)</code></a>") } func TestRender_FullIssueURLs(t *testing.T) { |