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

display search results correct; support HTML markup

Browse source
This commit is contained in:
Matthew Hodgson 2015-10-30 04:10:37 +00:00
parent d315e4afcd
commit fdfa0cbd0e
7 changed files with 116 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/skins/vector/views/molecules/EventTile.js
View file

@ -91,7 +91,8 @@ module.exports = React.createClass({
mx_EventTile_highlight: this.shouldHighlight(),
mx_EventTile_continuation: this.props.continuation,
mx_EventTile_last: this.props.last,
menu: this.state.menu
mx_EventTile_contextual: this.props.contextual,
menu: this.state.menu,
});
var timestamp = <MessageTimestamp ts={this.props.mxEvent.getTs()} />
var editButton = (
@ -126,7 +127,7 @@ module.exports = React.createClass({
<div className="mx_EventTile_line">
{ timestamp }
{ editButton }
<EventTileType mxEvent={this.props.mxEvent} />
<EventTileType mxEvent={this.props.mxEvent} searchTerm={this.props.searchTerm} />
</div>
</div>
);