Merge pull request #751 from hmhealey/plt344

PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting

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);
+    }
 }