summaryrefslogtreecommitdiffstats
path: root/web/react/components/search_results.jsx
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-08 11:34:34 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-08-12 11:19:42 -0700
commitd293bc0b799a679cd27ed4ef6e818b0ca96998d9 (patch)
tree6b12bb2d447cbe9cf24f0ea66ec096e6233c87d7 /web/react/components/search_results.jsx
parent95e6626f9f59b876479d8267b6c95105345e661d (diff)
downloadchat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.tar.gz
chat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.tar.bz2
chat-d293bc0b799a679cd27ed4ef6e818b0ca96998d9.zip
Implemented basic text formatting package using a modfied version of the marked js library. Supports *bold*, _italics_, and `code`
Diffstat (limited to 'web/react/components/search_results.jsx')
-rw-r--r--web/react/components/search_results.jsx12
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)
}