summaryrefslogtreecommitdiffstats
path: root/web/react/components/create_comment.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-14 15:13:04 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-14 15:13:04 -0400
commit9036dd99aa8ba2d9cdd6066a833862bbd9e2653a (patch)
tree41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/react/components/create_comment.jsx
parentb9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff)
parent26a8e19a357aee9e1b39623e604ce92bdfaa00df (diff)
downloadchat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.gz
chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.bz2
chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.zip
Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
Diffstat (limited to 'web/react/components/create_comment.jsx')
-rw-r--r--web/react/components/create_comment.jsx7
1 files changed, 1 insertions, 6 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index a0a018025..78e06c532 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -184,7 +184,6 @@ module.exports = React.createClass({
</div>
);
}
- var allowTextFormatting = config.AllowTextFormatting;
var postError = null;
if (this.state.postError) {
@@ -205,10 +204,6 @@ module.exports = React.createClass({
if (postError) {
postFooterClassName += ' has-error';
}
- var extraInfo = <MsgTyping channelId={this.props.channelId} parentId={this.props.rootId} />;
- if (this.state.messageText.split(' ').length > 1 && allowTextFormatting) {
- extraInfo = <span className='msg-format-help'>_<em>italics</em>_ *<strong>bold</strong>* `<code className='code-info'>code</code>`</span>;
- }
return (
<form onSubmit={this.handleSubmit}>
@@ -229,7 +224,7 @@ module.exports = React.createClass({
onFileUpload={this.handleFileUploadComplete}
onUploadError={this.handleUploadError} />
</div>
- {extraInfo}
+ <MsgTyping channelId={this.props.channelId} parentId={this.props.rootId} />
<div className={postFooterClassName}>
<input type='button' className='btn btn-primary comment-btn pull-right' value='Add Comment' onClick={this.handleSubmit} />
{postError}