Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix emojis not showing in commit messages (#5168) 

Fixes #5150

Signed-off-by: James Anderson <james@jamesa.me>
This commit is contained in:
James Anderson 2018-10-29 17:00:35 -04:00 committed by techknowlogick
parent d4e6278764
commit 1ceae07560
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/index.js
View File

@ -1766,6 +1766,11 @@ $(document).ready(function () {
var hasEmoji = document.getElementsByClassName('has-emoji'); var hasEmoji = document.getElementsByClassName('has-emoji');
for (var i = 0; i < hasEmoji.length; i++) { for (var i = 0; i < hasEmoji.length; i++) {
emojify.run(hasEmoji[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 // Clipboard JS

2
templates/repo/diff/page.tmpl
View File

@ -9,7 +9,7 @@
<a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}"> <a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}">
{{.i18n.Tr "repo.diff.browse_source"}} {{.i18n.Tr "repo.diff.browse_source"}}
</a> </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}} {{if IsMultilineCommitMessage .Commit.Message}}
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> <pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
{{end}} {{end}}