diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-09-22 14:30:50 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-09-22 14:30:50 -0400 |
commit | 1afa1d37c77b9508a4256e32c4e1fea27113033f (patch) | |
tree | c6c8bb345da696dbb8f9f49ffcce9843b3164ab1 /web/react/utils/markdown.jsx | |
parent | d025da5da9b6b6bf3c0003191f07a8184e545f8a (diff) | |
download | chat-1afa1d37c77b9508a4256e32c4e1fea27113033f.tar.gz chat-1afa1d37c77b9508a4256e32c4e1fea27113033f.tar.bz2 chat-1afa1d37c77b9508a4256e32c4e1fea27113033f.zip |
Moved text formatting code to only occur inside of markdown text nodes
Diffstat (limited to 'web/react/utils/markdown.jsx')
-rw-r--r-- | web/react/utils/markdown.jsx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 96da54217..0a876a3e3 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -1,9 +1,18 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +const TextFormatting = require('./text_formatting.jsx'); + const marked = require('marked'); export class MattermostMarkdownRenderer extends marked.Renderer { + constructor(options, formattingOptions = {}) { + super(options); + + this.text = this.text.bind(this); + + this.formattingOptions = formattingOptions; + } link(href, title, text) { let outHref = href; @@ -19,4 +28,8 @@ export class MattermostMarkdownRenderer extends marked.Renderer { return output; } + + text(text) { + return TextFormatting.doFormatText(text, this.formattingOptions); + } } |