summaryrefslogtreecommitdiffstats
path: root/web/react/components/create_comment.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/components/create_comment.jsx')
-rw-r--r--web/react/components/create_comment.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 78e06c532..a0a018025 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -184,6 +184,7 @@ module.exports = React.createClass({
</div>
);
}
+ var allowTextFormatting = config.AllowTextFormatting;
var postError = null;
if (this.state.postError) {
@@ -204,6 +205,10 @@ 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}>
@@ -224,7 +229,7 @@ module.exports = React.createClass({
onFileUpload={this.handleFileUploadComplete}
onUploadError={this.handleUploadError} />
</div>
- <MsgTyping channelId={this.props.channelId} parentId={this.props.rootId} />
+ {extraInfo}
<div className={postFooterClassName}>
<input type='button' className='btn btn-primary comment-btn pull-right' value='Add Comment' onClick={this.handleSubmit} />
{postError}