Skip to content

Code block fix #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
funayman wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Code block fix #100

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64a1a34
implement custom marked renderer
funayman Mar 25, 2019
84a6b08
manually escape code block
funayman Mar 25, 2019
74c9b4c
clean up console.logs and output
funayman Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,42 @@ const config = require('./config');

const awaiting_moderation = [];

marked.setOptions({ sanitize: true });
var renderer = new marked.Renderer();
renderer.code = function(code, language, escaped) {
// escaping helpers
var escapeReplace = /[&<>"']/g
var escapeReplacements = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
"'": '&#39;'
};


var lang = (language || '').match(/\S*/)[0];
if (this.options.highlight) {
var out = this.options.highlight(code, lang);
if (out != null && out !== code) {
escaped = true;
code = out;
}
}

if(!escaped) {
code = code.replace(escapeReplace, function (ch) { return escapeReplacements[ch]; });
}

if (!lang) {
return `<pre><code>${code}</code></pre>`;
}

lang = lang.replace(escapeReplace, function (ch) { return escapeReplacements[ch]; });

return `<pre class="${this.options.langPrefix}${lang}"><code class="${this.options.langPrefix}${lang}">${code}</code></pre>`;
}

marked.setOptions({ sanitize: true, langPrefix: "language-", renderer: renderer });

dbHandler
.init()
Expand Down