matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into kegan/tab-complete

Browse Source
This commit is contained in:
Kegan Dougal
2015-12-22 15:16:39 +00:00
parent e077517faf cc90f4c0c6
commit a20cabb06f
2 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/rooms/MessageComposer.js
View File

@@ -348,6 +348,9 @@ module.exports = React.createClass({
if (isEmote) {
contentText = contentText.substring(4);
}
else if (contentText[0] === '/') {
contentText = contentText.substring(1);
}
var htmlText;
if (this.markdownEnabled && (htmlText = mdownToHtml(contentText)) !== contentText) {