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/channel_header.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/channel_header.jsx')
-rw-r--r-- | web/react/components/channel_header.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index db23a5831..0dbbc20d4 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -8,6 +8,7 @@ const SocketStore = require('../stores/socket_store.jsx'); const NavbarSearchBox = require('./search_bar.jsx'); const AsyncClient = require('../utils/async_client.jsx'); const Client = require('../utils/client.jsx'); +const TextFormatting = require('../utils/text_formatting.jsx'); const Utils = require('../utils/utils.jsx'); const MessageWrapper = require('./message_wrapper.jsx'); const PopoverListMembers = require('./popover_list_members.jsx'); @@ -107,7 +108,6 @@ export default class ChannelHeader extends React.Component { } const channel = this.state.channel; - const description = Utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true}); const popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>); let channelTitle = channel.display_name; const currentId = UserStore.getCurrentId(); @@ -326,9 +326,9 @@ export default class ChannelHeader extends React.Component { data-toggle='popover' data-content={popoverContent} className='description' - > - {description} - </div> + onClick={TextFormatting.handleClick} + dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.description, {singleline: true, mentionHighlight: false})}} + /> </div> </th> <th> |