diff options
| author | Israel Madueme <purelogiq@gmail.com> | 2018-08-10 14:57:01 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-08-10 14:57:01 +0200 |
| commit | fd850e00db835d2b84c59014c3b1021fea2294fc (patch) | |
| tree | b5529f9bf45bb2b8f66b19714d215f1ca6c06c94 /extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl | |
| parent | 5a43b27f7940be9697f312c550fa2de11a9e14d7 (diff) | |
| download | bugzilla-fd850e00db835d2b84c59014c3b1021fea2294fc.tar.gz bugzilla-fd850e00db835d2b84c59014c3b1021fea2294fc.tar.xz | |
Bug 1456878 - Support markdown comments
Diffstat (limited to 'extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 08c6b5b64..340bb6f81 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -244,8 +244,17 @@ [% END %] [% BLOCK comment_body %] - <pre class="comment-text [%= "bz_private" IF comment.is_private %]" id="ct-[% comment.count FILTER none %]" - [% IF comment.collapsed +%] style="display:none"[% END ~%] + [% IF comment.is_markdown %] + [% comment_tag = 'div' %] + [% ELSE %] + [% comment_tag = 'pre' %] + [% END %] + + <[% comment_tag FILTER none %] class="comment-text [%= "bz_private" IF comment.is_private %]" + id="ct-[% comment.count FILTER none %]" + data-uniqueid="[% comment.id FILTER none %]" + [% IF comment.is_markdown +%] data-ismarkdown="true" [% END ~%] + [% IF comment.collapsed +%] style="display:none"[% END ~%] >[% FILTER collapse %] [% IF comment.is_about_attachment && comment.attachment.is_image ~%] <a href="attachment.cgi?id=[% comment.attachment.id FILTER none %]" @@ -253,7 +262,7 @@ class="lightbox"><img src="extensions/BugModal/web/image.png" width="16" height="16"></a> [% END %] [% END %] - [%~ comment.body_full FILTER quoteUrls(bug, comment) ~%]</pre> + [%~ comment.body_full FILTER renderComment(bug, comment) ~%]</[% comment_tag FILTER none %]> [% END %] [% |