diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-10-08 18:18:51 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-10-28 14:31:41 -0400 |
commit | 429e25864b86b7b5976348860a302c2843687ef4 (patch) | |
tree | 328e00eef5cbe96534960c80afc74c3c2e498002 /web/react/utils/text_formatting.jsx | |
parent | ccf9e0cabd9fcede118ca54b24adb33c788a7ae9 (diff) | |
download | chat-429e25864b86b7b5976348860a302c2843687ef4.tar.gz chat-429e25864b86b7b5976348860a302c2843687ef4.tar.bz2 chat-429e25864b86b7b5976348860a302c2843687ef4.zip |
Modified markdown lexer to not break up words written in snake_case
Diffstat (limited to 'web/react/utils/text_formatting.jsx')
-rw-r--r-- | web/react/utils/text_formatting.jsx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 9f1a5a53f..9c87d2693 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -8,8 +8,6 @@ const Markdown = require('./markdown.jsx'); const UserStore = require('../stores/user_store.jsx'); const Utils = require('./utils.jsx'); -const marked = require('marked'); - // Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and // @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options // as part of the second parameter: @@ -22,11 +20,8 @@ export function formatText(text, options = {}) { let output; if (!('markdown' in options) || options.markdown) { - // the markdown renderer will call doFormatText as necessary so just call marked - output = marked(text, { - renderer: new Markdown.MattermostMarkdownRenderer(null, options), - sanitize: true - }); + // the markdown renderer will call doFormatText as necessary + output = Markdown.format(text, options); } else { output = sanitizeHtml(text); output = doFormatText(output, options); |