summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--public/js/index.js5
-rw-r--r--templates/repo/diff/page.tmpl2
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}}