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

Merge pull request #2538 from fnkr/issue-markdown-code-block-highlighted 

Make highlighted markdown code blocks work on issue pages
This commit is contained in:
Unknwon 2016-02-01 15:31:05 -05:00
parent 3abad75a1b 3e0a27157c
commit 857b340498
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/gogs.js
View File

@ -18,6 +18,9 @@ function initCommentPreviewTab($form) {
var $preview_tab = $form.find('.tab.segment[data-tab="' + $tab_menu.data('preview') + '"]'); var $preview_tab = $form.find('.tab.segment[data-tab="' + $tab_menu.data('preview') + '"]');
$preview_tab.html(data); $preview_tab.html(data);
emojify.run($preview_tab[0]); emojify.run($preview_tab[0]);
$('pre code', $preview_tab[0]).each(function(i, block) {
hljs.highlightBlock(block);
});
} }
); );
}); });

5
routers/repo/issue.go
View File

@ -291,6 +291,8 @@ func NewIssue(ctx *middleware.Context) {
return return
} }
ctx.Data["RequireHighlightJS"] = true
ctx.HTML(200, ISSUE_NEW) ctx.HTML(200, ISSUE_NEW)
} }
@ -623,6 +625,9 @@ func ViewIssue(ctx *middleware.Context) {
ctx.Data["Issue"] = issue ctx.Data["Issue"] = issue
ctx.Data["IsIssueOwner"] = ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id)) ctx.Data["IsIssueOwner"] = ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id))
ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login" ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login"
ctx.Data["RequireHighlightJS"] = true
ctx.HTML(200, ISSUE_VIEW) ctx.HTML(200, ISSUE_VIEW)
} }