diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
| commit | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (patch) | |
| tree | 194e31d063e31009a15b994bbc34ad6497292e17 /web/react/components/channel_header.jsx | |
| parent | 92c4df5b109ac8b15f6384a5c027024696bbd4d8 (diff) | |
| parent | 41e74860d8abc8e33648471249b127dd3f60fb88 (diff) | |
| download | chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.gz chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.bz2 chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.zip | |
Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
Diffstat (limited to 'web/react/components/channel_header.jsx')
| -rw-r--r-- | web/react/components/channel_header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 90a776791..4d64e2b94 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -156,7 +156,7 @@ module.exports = React.createClass({ } var channel = this.state.channel; - var description = utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true}); + var description = utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true, noTextFormatting: true}); var popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>); var channelTitle = channel.display_name; var currentId = UserStore.getCurrentId(); |