IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed newlines being stripped from multiline code blocks

Browse Source
This commit is contained in:
hmhealey
2015-11-20 11:43:44 -05:00
parent fc346bcb05
commit dd3dc8c924
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
web/react/utils/markdown.jsx
View File

@@ -110,32 +110,47 @@ class MattermostMarkdownRenderer extends marked.Renderer {
this.formattingOptions = formattingOptions;
}
code(code, language) {
let usedLanguage = language;
code(code, language, escaped) {
let usedLanguage = language || '';
usedLanguage = usedLanguage.toLowerCase();
if (String(usedLanguage).toLocaleLowerCase() === 'html') {
// treat html as xml to prevent injection attacks
if (usedLanguage === 'html') {
usedLanguage = 'xml';
}
if (usedLanguage && (usedLanguage === 'tex' || usedLanguage === 'latex')) {
if (HighlightedLanguages[usedLanguage]) {
const parsed = highlightJs.highlight(usedLanguage, code);
return (
'<div class="post-body--code">' +
'<span class="post-body--code__language">' +
HighlightedLanguages[usedLanguage] +
'</span>' +
'<pre>' +
'<code class="hljs">' +
parsed.value +
'</code>' +
'</pre>' +
'</div>'
);
} else if (usedLanguage === 'tex' || usedLanguage === 'latex') {
try {
var html = katex.renderToString(TextFormatting.sanitizeHtml(code), {throwOnError: false, displayMode: true});
const html = katex.renderToString(TextFormatting.sanitizeHtml(code), {throwOnError: false, displayMode: true});
return '<div class="post-body--code tex">' + html + '</div>';
} catch (e) {
return '<div class="post-body--code">' + TextFormatting.sanitizeHtml(code) + '</div>';
// fall through if latex parsing fails and handle below
}
}
if (!usedLanguage || highlightJs.listLanguages().indexOf(usedLanguage) < 0) {
let parsed = super.code(code, usedLanguage);
return '<div class="post-body--code"><code class="hljs">' + TextFormatting.sanitizeHtml($(parsed).text()) + '</code></div>';
}
let parsed = highlightJs.highlight(usedLanguage, code);
return '<div class="post-body--code">' +
'<span class="post-body--code__language">' + HighlightedLanguages[usedLanguage] + '</span>' +
'<code class="hljs">' + parsed.value + '</code>' +
'</div>';
return (
'<pre>' +
'<code class="hljs">' +
(escaped ? code : TextFormatting.sanitizeHtml(code)) + '\n' +
'</code>' +
'</pre>'
);
}
br() {