From b68b367b3ca870c650c1bcf3809f1ee043f16e33 Mon Sep 17 00:00:00 2001 From: AWolf81 Date: Sat, 25 May 2019 07:16:03 +0200 Subject: [PATCH] Toggle linting gutter with document.querySelector and style.display --- browser/components/CodeEditor.js | 11 +++++------ browser/components/MarkdownEditor.js | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 95e1ed7c..eaf049f4 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -40,8 +40,6 @@ function translateHotkey (hotkey) { return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl') } -const DEFAULT_GUTTERS = ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'] - export default class CodeEditor extends React.Component { constructor (props) { super(props) @@ -280,7 +278,7 @@ export default class CodeEditor extends React.Component { dragDrop: false, foldGutter: true, lint: enableMarkdownLint ? this.setCodeEditorLintConfig() : false, - gutters: [...DEFAULT_GUTTERS, enableMarkdownLint && 'CodeMirror-lint-markers'], + gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'], autoCloseBrackets: { pairs: this.props.matchingPairs, triples: this.props.matchingTriples, @@ -290,6 +288,8 @@ export default class CodeEditor extends React.Component { extraKeys: this.defaultKeyMap }) + document.querySelector('.CodeMirror-lint-markers').style.display = enableMarkdownLint ? 'inline-block' : 'none' + if (!this.props.mode && this.props.value && this.props.autoDetect) { this.autoDetectLanguage(this.props.value) } else { @@ -539,12 +539,11 @@ export default class CodeEditor extends React.Component { if (prevProps.enableMarkdownLint !== enableMarkdownLint || prevProps.customMarkdownLintConfig !== customMarkdownLintConfig) { if (!enableMarkdownLint) { this.editor.setOption('lint', {default: false}) - this.editor.setOption('gutters', DEFAULT_GUTTERS) + document.querySelector('.CodeMirror-lint-markers').style.display = 'none' } else { this.editor.setOption('lint', this.setCodeEditorLintConfig()) - this.editor.setOption('gutters', [...DEFAULT_GUTTERS, 'CodeMirror-lint-markers']) + document.querySelector('.CodeMirror-lint-markers').style.display = 'inline-block' } - needRefresh = true } diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index 526ecb39..95cd7d7f 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -194,6 +194,7 @@ class MarkdownEditor extends React.Component { } reload () { + console.log('reloading editor...') this.refs.code.reload() this.cancelQueue() this.renderPreview(this.props.value) @@ -277,7 +278,7 @@ class MarkdownEditor extends React.Component { if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none' const storage = findStorage(storageKey) - + console.log('render editor', config) return (