PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix escaping markdown by rendering plaintext

Browse source 
We still need to parse "plaintext" messages through the markdown
renderer so that escappes are rendered properly.

Fixes vector-im/riot-web#2870.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
This commit is contained in:
Johannes Löthberg 2016-12-02 19:58:35 +01:00
parent fcb1d7a664
commit 893a5c971f
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Markdown.js
View file

@ -56,23 +56,31 @@ export default class Markdown {
return is_plain;
}
toHTML() {
render(html) {
const parser = new commonmark.Parser();
const renderer = new commonmark.HtmlRenderer({safe: true});
const real_paragraph = renderer.paragraph;
renderer.paragraph = function(node, entering) {
// If there is only one top level node, just return the
// bare text: it's a single line of text and so should be
// 'inline', rather than unnecessarily wrapped in its own
// p tag. If, however, we have multiple nodes, each gets
// its own p tag to keep them as separate paragraphs.
var par = node;
while (par.parent) {
par = par.parent
if (html) {
renderer.paragraph = function(node, entering) {
// If there is only one top level node, just return the
// bare text: it's a single line of text and so should be
// 'inline', rather than unnecessarily wrapped in its own
// p tag. If, however, we have multiple nodes, each gets
// its own p tag to keep them as separate paragraphs.
var par = node;
while (par.parent) {
par = par.parent
}
if (par.firstChild != par.lastChild) {
real_paragraph.call(this, node, entering);
}
}
if (par.firstChild != par.lastChild) {
real_paragraph.call(this, node, entering);
} else {
renderer.paragraph = function(node, entering) {
if (entering) {
this.lit('\n\n');
}
}
}

8
src/components/views/rooms/MessageComposerInput.js
View file

@ -401,7 +401,7 @@ export default class MessageComposerInput extends React.Component {
let contentState = null;
if (enabled) {
const md = new Markdown(this.state.editorState.getCurrentContent().getPlainText());
contentState = RichText.HTMLtoContentState(md.toHTML());
contentState = RichText.HTMLtoContentState(md.render(true));
} else {
let markdown = stateToMarkdown(this.state.editorState.getCurrentContent());
if (markdown[markdown.length - 1] === '\n') {
@ -523,8 +523,10 @@ export default class MessageComposerInput extends React.Component {
);
} else {
const md = new Markdown(contentText);
if (!md.isPlainText()) {
contentHTML = md.toHTML();
if (md.isPlainText()) {
contentText = md.render(false);
} else {
contentHTML = md.render(true);
}
}