ensure that 'lineNumbers' option for CodeMirrorEditor moved to props from 'editorOptions'

resource/js/components/PageComment/CommentForm.js

@@ -208,15 +208,16 @@ export default class CommentForm extends React.Component {
                 <div className="comment-write">
                   <Tabs activeKey={this.state.key} id="comment-form-tabs" onSelect={this.handleSelect} animation={false}>
                     <Tab eventKey={1} title="Write">
-                       <Editor ref="editor"
-                       value={this.state.comment}
-                       editorOptions={editorOptions}
-                       isMobile={this.props.crowi.isMobile}
-                       isUploadable={this.state.isUploadable}
-                       isUploadableFile={this.state.isUploadableFile}
-                       emojiStrategy={emojiStrategy}
-                       onChange={this.updateState}
-                       onUpload={this.onUpload}
+                      <Editor ref="editor"
+                        value={this.state.comment}
+                        editorOptions={editorOptions}
+                        lineNumbers={false}
+                        isMobile={this.props.crowi.isMobile}
+                        isUploadable={this.state.isUploadable}
+                        isUploadableFile={this.state.isUploadableFile}
+                        emojiStrategy={emojiStrategy}
+                        onChange={this.updateState}
+                        onUpload={this.onUpload}
                       />
                     </Tab>
                     { this.state.isMarkdown == true &&

resource/js/components/PageEditor/CodeMirrorEditor.js

@@ -424,7 +424,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
           mode: 'gfm',
           theme: editorOptions.theme,
           styleActiveLine: editorOptions.styleActiveLine,
-          lineNumbers: editorOptions.lineNumbers,
+          lineNumbers: this.props.lineNumbers,
           tabSize: 4,
           indentUnit: 4,
           lineWrapping: true,
@@ -433,8 +433,8 @@ export default class CodeMirrorEditor extends AbstractEditor {
           matchBrackets: true,
           matchTags: {bothTags: true},
           // folding
-          foldGutter: (editorOptions.lineNumbers ? true : false),
-          gutters: (editorOptions.lineNumbers ? ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'] : []),
+          foldGutter: this.props.lineNumbers,
+          gutters: this.props.lineNumbers ? ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'] : [],
           // match-highlighter, matchesonscrollbar, annotatescrollbar options
           highlightSelectionMatches: {annotateScrollbar: true},
           // markdown mode options
@@ -482,5 +482,8 @@ export default class CodeMirrorEditor extends AbstractEditor {
 
 CodeMirrorEditor.propTypes = Object.assign({
   emojiStrategy: PropTypes.object,
+  lineNumbers: PropTypes.bool,
 }, AbstractEditor.propTypes);
-
+CodeMirrorEditor.defaultProps = {
+  lineNumbers: true,
+};