OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Only send HTML if we need to.

pull/21833/head
Kegan Dougal 2015-11-20 17:30:14 +00:00
parent 2e32383570
commit f5e2a54603
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/controllers/molecules/MessageComposer.js
View File

@ -311,15 +311,18 @@ module.exports = {
this.props.room.roomId, contentText.substring(4) this.props.room.roomId, contentText.substring(4)
); );
} }
else if (this.markdownEnabled) {
sendMessagePromise = MatrixClientPeg.get().sendHtmlMessage(
this.props.room.roomId, contentText, mdownToHtml(contentText)
);
}
else { else {
sendMessagePromise = MatrixClientPeg.get().sendTextMessage( var htmlText = mdownToHtml(contentText);
this.props.room.roomId, contentText if (this.markdownEnabled && htmlText !== contentText) {
); sendMessagePromise = MatrixClientPeg.get().sendHtmlMessage(
this.props.room.roomId, contentText, htmlText
);
}
else {
sendMessagePromise = MatrixClientPeg.get().sendTextMessage(
this.props.room.roomId, contentText
);
}
} }
sendMessagePromise.then(function() { sendMessagePromise.then(function() {