From 69601bf15a1ab2f81cfd3ca4d59c43788b8446ce Mon Sep 17 00:00:00 2001 From: Junyoung Choi Date: Sat, 3 Feb 2018 15:02:26 +0900 Subject: [PATCH] Fix but: line numbers of editor isnt applied properly --- browser/components/CodeEditor.js | 5 +++-- browser/components/MarkdownSplitEditor.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index cda37836..217a14b1 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -51,6 +51,7 @@ export default class CodeEditor extends React.Component { componentDidMount () { this.value = this.props.value + this.editor = CodeMirror(this.refs.root, { value: this.props.value, lineNumbers: this.props.displayLineNumbers, @@ -71,7 +72,7 @@ export default class CodeEditor extends React.Component { if (cm.somethingSelected()) cm.indentSelection('add') else { const tabs = cm.getOption('indentWithTabs') - if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)\] )?$/)) { + if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)] )?$/)) { cm.execCommand('goLineStart') if (tabs) { cm.execCommand('insertTab') @@ -234,7 +235,7 @@ export default class CodeEditor extends React.Component { if (!dataTransferItem.type.match('image')) return const blob = dataTransferItem.getAsFile() - const reader = new FileReader() + const reader = new window.FileReader() let base64data reader.readAsDataURL(blob) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index d0a3eb27..2cf8e322 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -62,6 +62,7 @@ class MarkdownSplitEditor extends React.Component { keyMap={config.editor.keyMap} fontFamily={config.editor.fontFamily} fontSize={editorFontSize} + displayLineNumbers={config.editor.displayLineNumbers} indentType={config.editor.indentType} indentSize={editorIndentSize} scrollPastEnd={config.editor.scrollPastEnd}