diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-14 09:28:24 -0400 |
commit | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (patch) | |
tree | 194e31d063e31009a15b994bbc34ad6497292e17 /web/react/components/create_comment.jsx | |
parent | 92c4df5b109ac8b15f6384a5c027024696bbd4d8 (diff) | |
parent | 41e74860d8abc8e33648471249b127dd3f60fb88 (diff) | |
download | chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.gz chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.tar.bz2 chat-b9aef9f2a6b90663cb7ba4ff9e42560c145b631d.zip |
Merge pull request #360 from rgarmsen2295/mm-375d
MM-375 Adds text formatting features using a modified version of the marked js library
Diffstat (limited to 'web/react/components/create_comment.jsx')
-rw-r--r-- | web/react/components/create_comment.jsx | 7 |
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} |