From 167dd22eefeeeb9c1eaebd990a4f5902bd366302 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 29 Aug 2016 09:50:00 -0400 Subject: PLT-1752/PLT-3567/PLT-3998 Highlighting links in search, unit tests for autolinking (#3865) * Added highlighting to links when their URL includes the search term * Decoupling UserStore from react-router to allow for unit tests involving it * PLT-3998 Added SiteURL as an option to be passed into the text formatting code * Removed reference to PreferenceStore and window from TextFormatting * Refactored TextFormatting to remove remaining browser-only code * Updated ChannelHeader and MessageWrapper to match the changes to TextFormatting * Increased max listeners for Preference and Emoji stores * PLT-3832 Added automated unit tests for autolinking * PLT-3567 Rerender posts when mention keywords change * Updated RHS and search to match the changes to TextFormatting * Broke TextFormatting's dependency on the UserStore --- webapp/components/message_wrapper.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'webapp/components/message_wrapper.jsx') diff --git a/webapp/components/message_wrapper.jsx b/webapp/components/message_wrapper.jsx index 5e9939efa..4dba1024e 100644 --- a/webapp/components/message_wrapper.jsx +++ b/webapp/components/message_wrapper.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. import * as TextFormatting from 'utils/text_formatting.jsx'; +import * as Utils from 'utils/utils.jsx'; import React from 'react'; @@ -10,9 +11,19 @@ export default class MessageWrapper extends React.Component { super(props); this.state = {}; } + render() { if (this.props.message) { - return
; + const options = Object.assign({}, this.props.options, { + siteURL: Utils.getSiteURL() + }); + + return ( +
+ ); } return
; -- cgit v1.2.3-1-g7c22