Merge remote-tracking branch 'origin/feat/Markdown-editor-for-comment' into feat/Markdown-editor-for-comment

resource/js/components/PageComment/CommentForm.js

@@ -123,13 +123,13 @@ export default class CommentForm extends React.Component {
 
 
   render() {
-    const isMarkdown = this.state.isMarkdown;
     const crowi = this.props.crowi;
     const username = crowi.me;
     const user = crowi.findUser(username);
     const creatorsPage = `/user/${username}`;
     const comment = this.state.comment;
     const commentPreview = this.state.isMarkdown ? this.getCommentHtml(): ReactUtils.nl2br(comment);
+
     return (
       <div>
         <form className="form page-comment-form" id="page-comment-form" onSubmit={this.postComment}>
@@ -147,10 +147,10 @@ export default class CommentForm extends React.Component {
                       <textarea className="comment-form-comment form-control" id="comment-form-comment" name="comment" required placeholder="Write comments here..." value={this.state.comment} onChange={this.updateState} >
                       </textarea>
                     </Tab>
-                    { isMarkdown == true &&
+                    { this.state.isMarkdown == true &&
                     <Tab eventKey={2} title="Preview">
                       <div className="comment-form-preview">
-                      {commentPreview}
+                       {commentPreview}
                       </div>
                     </Tab>
                     }
@@ -158,9 +158,11 @@ export default class CommentForm extends React.Component {
                 </div>
                 <div className="comment-submit">
                   <div className="pull-left">
-                  <label>
-                    <input type="checkbox" id="comment-form-is-markdown" name="isMarkdown" checked={this.state.isMarkdown} value="1" onChange={this.updateState} /> Markdown
-                  </label>
+                  { this.state.key == 1 &&
+                    <label>
+                      <input type="checkbox" id="comment-form-is-markdown" name="isMarkdown" checked={this.state.isMarkdown} value="1" onChange={this.updateState} /> Markdown
+                    </label>
+                  }
                   </div>
                   <div className="pull-right">
                     <Button type="submit" value="Submit" bsStyle="primary" className="fcbtn btn btn-sm btn-primary btn-outline btn-rounded btn-1b">