From aa20bc769cfed3493c2a1582e45ead528f5f9fc2 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Thu, 29 Nov 2018 17:06:28 +0000 Subject: [PATCH 1/6] Fixed lock button behaviour and display --- browser/components/MarkdownEditor.js | 4 ++-- browser/main/Detail/MarkdownNoteDetail.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index f3bb92bbc..e2bc5e231 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -19,10 +19,10 @@ class MarkdownEditor extends React.Component { this.supportMdSelectionBold = [16, 17, 186] this.state = { - status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'PREVIEW', + status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'CODE', renderValue: props.value, keyPressed: new Set(), - isLocked: false + isLocked: props.isLocked } this.lockEditorCode = () => this.handleLockEditor() diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 116fdec0a..588af9aea 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -288,6 +288,8 @@ class MarkdownNoteDetail extends React.Component { } handleSwitchMode (type) { + // If in split mode, hide the lock button + if (type === 'SPLIT') this.setState({isLockButtonShown: false}) this.setState({ editorType: type }, () => { this.focus() const newConfig = Object.assign({}, this.props.config) @@ -332,6 +334,7 @@ class MarkdownNoteDetail extends React.Component { storageKey={note.storage} noteKey={note.key} onChange={this.handleUpdateContent.bind(this)} + isLocked={this.state.isLocked} ignorePreviewPointerEvents={ignorePreviewPointerEvents} /> } else { From c5de940946e5056bd1cf15bb65802a1b4dedaeed Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Wed, 12 Dec 2018 18:19:41 +0000 Subject: [PATCH 2/6] Fixed bug where icon was hidden --- browser/main/Detail/MarkdownNoteDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index aefcc6140..cb53fcda0 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -41,7 +41,7 @@ class MarkdownNoteDetail extends React.Component { title: '', content: '' }, props.note), - isLockButtonShown: false, + isLockButtonShown: true, isLocked: false, editorType: props.config.editor.type } From 3b110bcd4b88ef309c616a05ac1c060310404abb Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Thu, 13 Dec 2018 11:55:04 +0000 Subject: [PATCH 3/6] WIP --- browser/main/Detail/MarkdownNoteDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index cb53fcda0..aefcc6140 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -41,7 +41,7 @@ class MarkdownNoteDetail extends React.Component { title: '', content: '' }, props.note), - isLockButtonShown: true, + isLockButtonShown: false, isLocked: false, editorType: props.config.editor.type } From 37340d0445ea89f34ac83f648e11922d220a8d14 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Thu, 13 Dec 2018 19:09:41 +0000 Subject: [PATCH 4/6] Fixed issue with double and right click --- browser/components/MarkdownEditor.js | 1 + browser/main/Detail/MarkdownNoteDetail.js | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index 8c798159d..65fdb1bc6 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -75,6 +75,7 @@ class MarkdownEditor extends React.Component { } handleContextMenu (e) { + if (this.state.isLocked) return const { config } = this.props if (config.editor.switchPreview === 'RIGHTCLICK') { const newStatus = this.state.status === 'PREVIEW' ? 'CODE' : 'PREVIEW' diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index aefcc6140..bcb79b8e3 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -292,7 +292,7 @@ class MarkdownNoteDetail extends React.Component { handleToggleLockButton (event, noteStatus) { // first argument event is not used - if (this.props.config.editor.switchPreview === 'BLUR' && noteStatus === 'CODE') { + if (noteStatus === 'CODE') { this.setState({isLockButtonShown: true}) } else { this.setState({isLockButtonShown: false}) @@ -319,13 +319,14 @@ class MarkdownNoteDetail extends React.Component { handleSwitchMode (type) { // If in split mode, hide the lock button - if (type === 'SPLIT') this.setState({isLockButtonShown: false}) - this.setState({ editorType: type }, () => { + this.setState({ editorType: type, isLockButtonShown: !(type === 'SPLIT') }, () => { this.focus() const newConfig = Object.assign({}, this.props.config) newConfig.editor.type = type ConfigManager.set(newConfig) }) + + console.log(this.state); } handleDeleteNote () { From 6631f98c43f87b703bbff7f7b3e19eb0ea6a4624 Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Thu, 13 Dec 2018 19:13:12 +0000 Subject: [PATCH 5/6] Removed debug log --- browser/main/Detail/MarkdownNoteDetail.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index bcb79b8e3..33beb35bf 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -325,8 +325,6 @@ class MarkdownNoteDetail extends React.Component { newConfig.editor.type = type ConfigManager.set(newConfig) }) - - console.log(this.state); } handleDeleteNote () { From 7f6d4acf90753fc452c5ac16a5b1f559a1b4e95d Mon Sep 17 00:00:00 2001 From: Miguel Teixeira Date: Wed, 19 Dec 2018 15:16:55 +0000 Subject: [PATCH 6/6] Fixed lock button not appearing --- browser/main/Detail/MarkdownNoteDetail.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 33beb35bf..eed40cb31 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -41,9 +41,10 @@ class MarkdownNoteDetail extends React.Component { title: '', content: '' }, props.note), - isLockButtonShown: false, + isLockButtonShown: props.config.editor.type !== 'SPLIT', isLocked: false, - editorType: props.config.editor.type + editorType: props.config.editor.type, + switchPreview: props.config.editor.switchPreview } this.dispatchTimer = null @@ -63,6 +64,9 @@ class MarkdownNoteDetail extends React.Component { }) ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this)) ee.on('code:generate-toc', this.generateToc) + + // Focus content if using blur or double click + if (this.state.switchPreview === 'BLUR' || this.state.switchPreview === 'DBL_CLICK') this.focus() } componentWillReceiveProps (nextProps) {