Browse Source

Fix emojis not showing in commit messages (#5168)

Fixes #5150

Signed-off-by: James Anderson <james@jamesa.me>
tags/v1.7.0-dev
James Anderson 5 years ago
parent
commit
1ceae07560
2 changed files with 6 additions and 1 deletions
  1. 5
    0
      public/js/index.js
  2. 1
    1
      templates/repo/diff/page.tmpl

+ 5
- 0
public/js/index.js View File

@@ -1766,6 +1766,11 @@ $(document).ready(function () {
var hasEmoji = document.getElementsByClassName('has-emoji');
for (var i = 0; i < hasEmoji.length; i++) {
emojify.run(hasEmoji[i]);
for (var j = 0; j < hasEmoji[i].childNodes.length; j++) {
if (hasEmoji[i].childNodes[j].nodeName === "A") {
emojify.run(hasEmoji[i].childNodes[j])
}
}
}

// Clipboard JS

+ 1
- 1
templates/repo/diff/page.tmpl View File

@@ -9,7 +9,7 @@
<a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}">
{{.i18n.Tr "repo.diff.browse_source"}}
</a>
<h3>{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_status" .CommitStatus}}</h3>
<h3 class="has-emoji">{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_status" .CommitStatus}}</h3>
{{if IsMultilineCommitMessage .Commit.Message}}
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
{{end}}

Loading…
Cancel
Save