From 3b268cc8eb66101266276907efba4a7c57fc4ec9 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 5 May 2020 21:42:18 +0200 Subject: [PATCH 1/3] fix selecting note title after creation, closes #997 --- src/public/app/services/main_tree_executors.js | 16 ++-------------- src/public/app/services/note_create.js | 6 +++++- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/public/app/services/main_tree_executors.js b/src/public/app/services/main_tree_executors.js index 61717e64f..a365393f3 100644 --- a/src/public/app/services/main_tree_executors.js +++ b/src/public/app/services/main_tree_executors.js @@ -38,12 +38,6 @@ export default class MainTreeExecutors extends Component { isProtected: activeNote.isProtected, saveSelection: false }); - - await ws.waitForMaxKnownSyncId(); - - appContext.tabManager.getActiveTabContext().setNote(note.noteId); - - appContext.triggerCommand('focusAndSelectTitle'); } async createNoteAfterCommand() { @@ -55,17 +49,11 @@ export default class MainTreeExecutors extends Component { return; } - const {note} = await noteCreateService.createNote(parentNoteId, { + await noteCreateService.createNote(parentNoteId, { target: 'after', targetBranchId: node.data.branchId, isProtected: isProtected, - saveSelection: true + saveSelection: false }); - - await ws.waitForMaxKnownSyncId(); - - appContext.tabManager.getActiveTabContext().setNote(note.noteId); - - appContext.triggerCommand('focusAndSelectTitle'); } } \ No newline at end of file diff --git a/src/public/app/services/note_create.js b/src/public/app/services/note_create.js index 24501f10c..353bc7a36 100644 --- a/src/public/app/services/note_create.js +++ b/src/public/app/services/note_create.js @@ -48,8 +48,12 @@ async function createNote(parentNoteId, options = {}) { } if (options.activate) { + await ws.waitForMaxKnownSyncId(); + const activeTabContext = appContext.tabManager.getActiveTabContext(); - activeTabContext.setNote(note.noteId); + await activeTabContext.setNote(note.noteId); + + appContext.triggerCommand('focusAndSelectTitle'); } return {note, branch}; From 7f2755d4a05b0c110b49df4cae660f4855343fe5 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 5 May 2020 22:18:09 +0200 Subject: [PATCH 2/3] refresh button state change on note update --- src/public/app/widgets/run_script_buttons.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/run_script_buttons.js b/src/public/app/widgets/run_script_buttons.js index a94a1e54f..f74b96be4 100644 --- a/src/public/app/widgets/run_script_buttons.js +++ b/src/public/app/widgets/run_script_buttons.js @@ -20,7 +20,13 @@ export default class RunScriptButtonsWidget extends TabAwareWidget { } refreshWithNote(note) { - this.$renderButton.toggle(note.type === 'render'); + this.$renderButton.toggle(note.type === 'render');console.log("note.mime", note.mime); this.$executeScriptButton.toggle(note.mime.startsWith('application/javascript')); } + + async entitiesReloadedEvent({loadResults}) { + if (loadResults.isNoteReloaded(this.noteId)) { + this.refresh(); + } + } } \ No newline at end of file From 9b9d6d86d0d70c93ebbec4a8f1ef8966052f6294 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 5 May 2020 22:51:53 +0200 Subject: [PATCH 3/3] remove debugging console.log --- src/public/app/widgets/run_script_buttons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/run_script_buttons.js b/src/public/app/widgets/run_script_buttons.js index f74b96be4..a93bd7707 100644 --- a/src/public/app/widgets/run_script_buttons.js +++ b/src/public/app/widgets/run_script_buttons.js @@ -20,7 +20,7 @@ export default class RunScriptButtonsWidget extends TabAwareWidget { } refreshWithNote(note) { - this.$renderButton.toggle(note.type === 'render');console.log("note.mime", note.mime); + this.$renderButton.toggle(note.type === 'render'); this.$executeScriptButton.toggle(note.mime.startsWith('application/javascript')); }