diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-15 08:20:01 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-15 08:20:01 -0400 |
commit | 4a9984d166ff939129740f69e1bd382769a954bb (patch) | |
tree | 1e035ed97b937066f27c72899c240689efe58e66 /web/react/components/search_results_item.jsx | |
parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
parent | 4c9ae22b6207c477b92737f4e79901c7366a4792 (diff) | |
download | chat-4a9984d166ff939129740f69e1bd382769a954bb.tar.gz chat-4a9984d166ff939129740f69e1bd382769a954bb.tar.bz2 chat-4a9984d166ff939129740f69e1bd382769a954bb.zip |
Merge pull request #676 from hmhealey/mm1900b
MM-1900 Removed textToJsx
Diffstat (limited to 'web/react/components/search_results_item.jsx')
-rw-r--r-- | web/react/components/search_results_item.jsx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index aa56f1174..0e951f5c6 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -10,6 +10,7 @@ var client = require('../utils/client.jsx'); var AsyncClient = require('../utils/async_client.jsx'); var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); var Constants = require('../utils/constants.jsx'); +var TextFormatting = require('../utils/text_formatting.jsx'); var ActionTypes = Constants.ActionTypes; export default class SearchResultsItem extends React.Component { @@ -56,7 +57,6 @@ export default class SearchResultsItem extends React.Component { } render() { - var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch}); var channelName = ''; var channel = ChannelStore.get(this.props.post.channel_id); var timestamp = UserStore.getCurrentUser().update_at; @@ -68,6 +68,11 @@ export default class SearchResultsItem extends React.Component { } } + const formattingOptions = { + searchTerm: this.props.term, + mentionHighlight: this.props.isMentionSearch + }; + return ( <div className='search-item-container post' @@ -91,7 +96,12 @@ export default class SearchResultsItem extends React.Component { </time> </li> </ul> - <div className='search-item-snippet'><span>{message}</span></div> + <div className='search-item-snippet'> + <span + onClick={this.handleClick} + dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message, formattingOptions)}} + /> + </div> </div> </div> ); @@ -102,4 +112,4 @@ SearchResultsItem.propTypes = { post: React.PropTypes.object, isMentionSearch: React.PropTypes.bool, term: React.PropTypes.string -};
\ No newline at end of file +}; |