diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-22 09:39:47 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-22 09:39:47 -0400 |
| commit | 14e24650c501a2ee93b9dafb4f5877ba5a9ec22f (patch) | |
| tree | 77cd7d914d66cd48ff936bf9df2d152b1b5cf958 /web/react/utils | |
| parent | 2d922fde7e33125b55fd70f713c867db89ebfcf5 (diff) | |
| parent | fba89915ac9a0421a5441cdb23958099467a0a56 (diff) | |
| download | chat-14e24650c501a2ee93b9dafb4f5877ba5a9ec22f.tar.gz chat-14e24650c501a2ee93b9dafb4f5877ba5a9ec22f.tar.bz2 chat-14e24650c501a2ee93b9dafb4f5877ba5a9ec22f.zip | |
Merge pull request #1135 from trashcan/PLT-521
PLT-521: Fix emoji with underscores
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/markdown.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 2813798d2..1b699bc98 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -53,11 +53,13 @@ export class MattermostMarkdownRenderer extends marked.Renderer { } paragraph(text) { + let outText = TextFormatting.doFormatText(text, this.options); + 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) { |