summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-14 15:03:32 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-14 15:03:32 -0400
commit26a8e19a357aee9e1b39623e604ce92bdfaa00df (patch)
tree41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/react/components/sidebar.jsx
parentb9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff)
downloadchat-26a8e19a357aee9e1b39623e604ce92bdfaa00df.tar.gz
chat-26a8e19a357aee9e1b39623e604ce92bdfaa00df.tar.bz2
chat-26a8e19a357aee9e1b39623e604ce92bdfaa00df.zip
Revert "MM-375 Adds text formatting features using a modified version of the marked js library"
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx6
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') {