Merge pull request #360 from rgarmsen2295/mm-375d

MM-375 Adds text formatting features using a modified version of the marked js library

1 files changed, 6 insertions, 1 deletions

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 9ca1d5388..3e1faba7d 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -224,6 +224,7 @@ module.exports = React.createClass({
                 </div>
             );
         }
+        var allowTextFormatting = config.AllowTextFormatting;
 
         var postError = null;
         if (this.state.postError) {
@@ -244,6 +245,10 @@ module.exports = React.createClass({
         if (postError) {
             postFooterClassName += ' has-error';
         }
+        var extraInfo = <MsgTyping channelId={this.state.channel_id} parentId='' />;
+        if (this.state.messageText.split(' ').length > 1 && allowTextFormatting) {
+            extraInfo = <span className='msg-typing'>_<em>italics</em>_ *<strong>bold</strong>* `<code className='code-info'>code</code>`</span>;
+        }
 
         return (
             <form id='create_post' ref='topDiv' role='form' onSubmit={this.handleSubmit}>
@@ -268,7 +273,7 @@ module.exports = React.createClass({
                         {postError}
                         {serverError}
                         {preview}
-                        <MsgTyping channelId={this.state.channelId} parentId=''/>
+                        {extraInfo}
                     </div>
                 </div>
             </form>