From 04533bb8766a9591e4e662b1be1bc43b38d78193 Mon Sep 17 00:00:00 2001 From: joaopscastro Date: Thu, 6 Dec 2018 12:39:48 +0000 Subject: [PATCH 1/3] Start of enhancement --- browser/components/CodeEditor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 130cc86e0..063ea6cc6 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -211,6 +211,7 @@ export default class CodeEditor extends React.Component { }) this.value = this.props.value + this.mirrorActive = this.props.value this.editor = CodeMirror(this.refs.root, { rulers: buildCMRulers(rulers, enableRulers), value: this.props.value, @@ -775,7 +776,8 @@ CodeEditor.propTypes = { onBlur: PropTypes.func, onChange: PropTypes.func, readOnly: PropTypes.bool, - spellCheck: PropTypes.bool + spellCheck: PropTypes.bool, + mirrorActive: PropTypes.bool } CodeEditor.defaultProps = { From 408708900f368851bc12d25315c664da588cdaec Mon Sep 17 00:00:00 2001 From: joaopscastro Date: Thu, 13 Dec 2018 13:28:06 +0000 Subject: [PATCH 2/3] Implement enhacement --- browser/components/CodeEditor.js | 15 ++++++++--- browser/components/MarkdownEditor.js | 1 + browser/components/MarkdownSplitEditor.js | 1 + browser/main/lib/ConfigManager.js | 3 ++- browser/main/modals/PreferencesModal/UiTab.js | 26 +++++++++++++++++-- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 063ea6cc6..c895fc954 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -211,7 +211,15 @@ export default class CodeEditor extends React.Component { }) this.value = this.props.value - this.mirrorActive = this.props.value + console.log(this.props.enableCodeMirror) + var enable = true + if (this.props.enableCodeMirror === 'true') { + enable = true + } else { + enable = false + } + console.log('editor: ') + console.log(enable) this.editor = CodeMirror(this.refs.root, { rulers: buildCMRulers(rulers, enableRulers), value: this.props.value, @@ -231,11 +239,10 @@ export default class CodeEditor extends React.Component { pairs: '()[]{}\'\'""$$**``', triples: '```"""\'\'\'', explode: '[]{}``$$', - override: true + override: enable }, extraKeys: this.defaultKeyMap }) - this.setMode(this.props.mode) this.editor.on('focus', this.focusHandler) @@ -777,7 +784,7 @@ CodeEditor.propTypes = { onChange: PropTypes.func, readOnly: PropTypes.bool, spellCheck: PropTypes.bool, - mirrorActive: PropTypes.bool + enableCodeMirror: PropTypes.bool } CodeEditor.defaultProps = { diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index 20ce9451a..275a3c3f3 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -278,6 +278,7 @@ class MarkdownEditor extends React.Component { onChange={(e) => this.handleChange(e)} onBlur={(e) => this.handleBlur(e)} spellCheck={config.editor.spellcheck} + enableCodeMirror={config.editor.enableCodeMirror} />
this.handleMouseDown(e)} >
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index d6b04d9bb..c1d858b31 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -52,7 +52,8 @@ export const DEFAULT_CONFIG = { enableTableEditor: false, enableFrontMatterTitle: true, frontMatterTitleField: 'title', - spellcheck: false + spellcheck: false, + enableCodeMirror: true }, preview: { fontSize: '14', diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index a52bee9dc..9282dab37 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -55,6 +55,7 @@ class UiTab extends React.Component { handleUIChange (e) { const { codemirrorTheme } = this.state let checkHighLight = document.getElementById('checkHighLight') + console.log(this.refs.enableCodeMirror.value) if (checkHighLight === null) { checkHighLight = document.createElement('link') @@ -96,7 +97,8 @@ class UiTab extends React.Component { enableTableEditor: this.refs.enableTableEditor.checked, enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked, frontMatterTitleField: this.refs.frontMatterTitleField.value, - spellcheck: this.refs.spellcheck.checked + spellcheck: this.refs.spellcheck.checked, + enableCodeMirror: this.refs.enableCodeMirror.value }, preview: { fontSize: this.refs.previewFontSize.value, @@ -434,7 +436,27 @@ class UiTab extends React.Component { />
- +
+
+ {i18n.__('Double Characters [Needs Refresh] ')} +
+
+
+ +
+
+
{i18n.__('Switch to Preview')} From 4019f1487b95a46c81b1d015dd7f97543131d125 Mon Sep 17 00:00:00 2001 From: joaopscastro Date: Wed, 19 Dec 2018 15:49:47 +0000 Subject: [PATCH 3/3] Fix problems with merge --- browser/components/CodeEditor.js | 3 --- browser/main/lib/ConfigManager.js | 2 +- browser/main/modals/PreferencesModal/UiTab.js | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 1d56ac313..9921911d5 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -232,15 +232,12 @@ export default class CodeEditor extends React.Component { this.updateDefaultKeyMap() this.value = this.props.value - console.log(this.props.enableCodeMirror) var enable = true if (this.props.enableCodeMirror === 'true') { enable = true } else { enable = false } - console.log('editor: ') - console.log(enable) this.editor = CodeMirror(this.refs.root, { rulers: buildCMRulers(rulers, enableRulers), value: this.props.value, diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index e1695cefb..2f5d84865 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -54,7 +54,7 @@ export const DEFAULT_CONFIG = { enableFrontMatterTitle: true, frontMatterTitleField: 'title', spellcheck: false, - enableCodeMirror: true + enableCodeMirror: true, enableSmartPaste: false }, preview: { diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index e773ff1ed..f068d891b 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -98,7 +98,7 @@ class UiTab extends React.Component { enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked, frontMatterTitleField: this.refs.frontMatterTitleField.value, spellcheck: this.refs.spellcheck.checked, - enableCodeMirror: this.refs.enableCodeMirror.value + enableCodeMirror: this.refs.enableCodeMirror.value, enableSmartPaste: this.refs.enableSmartPaste.checked }, preview: {