diff options
| author | James Anderson <james@jamesa.me> | 2018-10-29 17:00:35 -0400 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2018-10-29 17:00:34 -0400 |
| commit | 1ceae0756045c2379b98020ef32a8d37de7859ac (patch) | |
| tree | df7afb2bc4e299d5bb6b0ce1ec010e9d964ed6f1 | |
| parent | d4e62787644bf08e5044b7aeb36c0080cd892fef (diff) | |
| download | gitea-1ceae0756045c2379b98020ef32a8d37de7859ac.tar.gz gitea-1ceae0756045c2379b98020ef32a8d37de7859ac.zip | |
Fix emojis not showing in commit messages (#5168)
Fixes #5150
Signed-off-by: James Anderson <james@jamesa.me>
| -rw-r--r-- | public/js/index.js | 5 | ||||
| -rw-r--r-- | templates/repo/diff/page.tmpl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/public/js/index.js b/public/js/index.js index 7700093598..0bc28c4f96 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -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 diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl index ba0cf348d4..cc8811848e 100644 --- a/templates/repo/diff/page.tmpl +++ b/templates/repo/diff/page.tmpl @@ -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}} |