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

Merge remote-tracking branch 'origin/develop' into notif_sync

Browse source
This commit is contained in:
David Baker 2015-12-22 14:47:11 +00:00
commit 05d9e1261c
3 changed files with 234 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -319,6 +319,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) {

2
src/components/views/rooms/RoomHeader.js
View file

@ -106,7 +106,7 @@ module.exports = React.createClass({
// don't display the search count until the search completes and
// gives us a non-null searchCount.
if (this.props.searchInfo && this.props.searchInfo.searchCount !== null) {
searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;({ this.props.searchInfo.searchCount } results)</div>;
searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;(~{ this.props.searchInfo.searchCount } results)</div>;
}
name =