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

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

1 files changed, 0 insertions, 6 deletions

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 988ef4a9c..80e3632c7 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -11,7 +11,6 @@ var BrowserStore = require('../stores/browser_store.jsx');
 var utils = require('../utils/utils.jsx');
 var SidebarHeader = require('./sidebar_header.jsx');
 var SearchBox = require('./search_bar.jsx');
-var formatText = require('../../static/js/marked/lib/marked.js');
 
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -210,11 +209,6 @@ module.exports = React.createClass({
                         utils.notifyMe(title, username + ' did something new', channel);
                     }
                 } else {
-                    var allowTextFormatting = config.AllowTextFormatting;
-                    if (allowTextFormatting) {
-                        notifyText = formatText(notifyText, {sanitize: false, mangle: false, gfm: true, breaks: true, tables: false, smartypants: true, renderer: utils.customMarkedRenderer({disable: true})});
-                    }
-                    notifyText = utils.replaceHtmlEntities(notifyText);
                     utils.notifyMe(title, username + ' wrote: ' + notifyText, channel);
                 }
                 if (!user.notify_props || user.notify_props.desktop_sound === 'true') {