imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #622 from kyrias/commonmark-fix-escaping

Browse source 
Fix escaping markdown by rendering plaintext
This commit is contained in:
Kegsay 2017-01-19 13:39:07 +00:00 • committed by GitHub
commit 89fa47dc26
4 changed files with 134 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,9 @@ export default class MessageComposerInput extends React.Component {
);
} else {
const md = new Markdown(contentText);
if (!md.isPlainText()) {
if (md.isPlainText()) {
contentText = md.toPlaintext();
} else {
contentHTML = md.toHTML();
}
}

1
src/components/views/rooms/MessageComposerInputOld.js
View file

@ -331,6 +331,7 @@ module.exports = React.createClass({
MatrixClientPeg.get().sendHtmlMessage(this.props.room.roomId, contentText, htmlText);
}
else {
const contentText = mdown.toPlaintext();
sendMessagePromise = isEmote ?
MatrixClientPeg.get().sendEmoteMessage(this.props.room.roomId, contentText) :
MatrixClientPeg.get().sendTextMessage(this.props.room.roomId, contentText);