diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
commit | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (patch) | |
tree | 194e31d063e31009a15b994bbc34ad6497292e17 /web/react/components/search_results.jsx | |
parent | 92c4df5b109ac8b15f6384a5c027024696bbd4d8 (diff) | |
parent | 41e74860d8abc8e33648471249b127dd3f60fb88 (diff) | |
download | chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.gz chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.bz2 chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.zip |
Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
Diffstat (limited to 'web/react/components/search_results.jsx')
-rw-r--r-- | web/react/components/search_results.jsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx index 643ad112b..8f6bd861a 100644 --- a/web/react/components/search_results.jsx +++ b/web/react/components/search_results.jsx @@ -84,6 +84,8 @@ var SearchItem = React.createClass({ channelName = (channel.type === 'D') ? "Private Message" : channel.display_name; } + var searchItemKey = Date.now().toString(); + return ( <div className="search-item-container post" onClick={this.handleClick}> <div className="search-channel__name">{ channelName }</div> @@ -99,7 +101,7 @@ var SearchItem = React.createClass({ </time> </li> </ul> - <div className="search-item-snippet"><span>{message}</span></div> + <div key={this.props.key + searchItemKey} className="search-item-snippet"><span>{message}</span></div> </div> </div> ); @@ -131,6 +133,7 @@ module.exports = React.createClass({ if (this.isMounted()) { var newState = getStateFromStores(); if (!utils.areStatesEqual(newState, this.state)) { + newState.last_edit_time = Date.now(); this.setState(newState); } } @@ -152,6 +155,11 @@ module.exports = React.createClass({ var noResults = (!results || !results.order || !results.order.length); var searchTerm = PostStore.getSearchTerm(); + var searchItemKey = ""; + if (this.state.last_edit_time) { + searchItemKey += this.state.last_edit_time.toString(); + } + return ( <div className="sidebar--right__content"> <div className="search-bar__container sidebar--right__search-header">{searchForm}</div> @@ -162,7 +170,7 @@ module.exports = React.createClass({ { noResults ? <div className="sidebar--right__subheader">No results</div> : results.order.map(function(id) { var post = results.posts[id]; - return <SearchItem key={post.id} post={post} term={searchTerm} isMentionSearch={this.props.isMentionSearch} /> + return <SearchItem key={searchItemKey + post.id} post={post} term={searchTerm} isMentionSearch={this.props.isMentionSearch} /> }, this) } |