diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-29 09:50:00 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-08-29 09:50:00 -0400 |
| commit | 167dd22eefeeeb9c1eaebd990a4f5902bd366302 (patch) | |
| tree | 6ddb15a80b2a608d42e20df72b98c0ae72821671 /webapp/components/channel_header.jsx | |
| parent | 55342e8fe16613f06528ed1aa726231e9b597d26 (diff) | |
| download | chat-167dd22eefeeeb9c1eaebd990a4f5902bd366302.tar.gz chat-167dd22eefeeeb9c1eaebd990a4f5902bd366302.tar.bz2 chat-167dd22eefeeeb9c1eaebd990a4f5902bd366302.zip | |
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
Diffstat (limited to 'webapp/components/channel_header.jsx')
| -rw-r--r-- | webapp/components/channel_header.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 65c856b4a..6cecc04bd 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -581,9 +581,9 @@ export default class ChannelHeader extends React.Component { ref='headerOverlay' > <div - onClick={TextFormatting.handleClick} + onClick={Utils.handleFormattedTextClick} className='description' - dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.header, {singleline: true, mentionHighlight: false})}} + dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.header, {singleline: true, mentionHighlight: false, siteURL: Utils.getSiteURL()})}} /> </OverlayTrigger> </div> |