Merge pull request #382 from mattermost/revert-360-mm-375d

Revert "MM-375 Adds text formatting features using a modified version…

1 files changed, 1 insertions, 6 deletions

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 3e1faba7d..9ca1d5388 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -224,7 +224,6 @@ module.exports = React.createClass({
                 </div>
             );
         }
-        var allowTextFormatting = config.AllowTextFormatting;
 
         var postError = null;
         if (this.state.postError) {
@@ -245,10 +244,6 @@ 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}>
@@ -273,7 +268,7 @@ module.exports = React.createClass({
                         {postError}
                         {serverError}
                         {preview}
-                        {extraInfo}
+                        <MsgTyping channelId={this.state.channelId} parentId=''/>
                     </div>
                 </div>
             </form>