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

Merge branch 'develop' into kegan/tab-complete

Browse source
This commit is contained in:
Kegan Dougal 2015-12-22 15:16:39 +00:00
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) {