summaryrefslogtreecommitdiffstats
path: root/web/react/utils/markdown.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-22 09:19:18 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-22 09:19:18 -0700
commit54894e90ac705eab3bf0f34c8dd197bb0929feae (patch)
tree2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /web/react/utils/markdown.jsx
parentc4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff)
parent649f42e3fc706f8fa829276bcdb825381bc703f2 (diff)
downloadchat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz
chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2
chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip
Fixing merge conflict
Diffstat (limited to 'web/react/utils/markdown.jsx')
-rw-r--r--web/react/utils/markdown.jsx11
1 files changed, 9 insertions, 2 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 2813798d2..7a4e70054 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -11,6 +11,7 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
super(options);
this.heading = this.heading.bind(this);
+ this.paragraph = this.paragraph.bind(this);
this.text = this.text.bind(this);
this.formattingOptions = formattingOptions;
@@ -53,11 +54,17 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
}
paragraph(text) {
+ let outText = text;
+
+ if (!('emoticons' in this.options) || this.options.emoticon) {
+ outText = TextFormatting.doFormatEmoticons(text);
+ }
+
if (this.formattingOptions.singleline) {
- return `<p class="markdown__paragraph-inline">${text}</p>`;
+ return `<p class="markdown__paragraph-inline">${outText}</p>`;
}
- return super.paragraph(text);
+ return super.paragraph(outText);
}
table(header, body) {