From 091eb8f79115f15d9c4eaeff3a3fdc4d475cbe86 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 6 Mar 2020 23:34:39 +0100
Subject: [PATCH] event fixes WIP

---
 src/public/javascripts/dialogs/note_source.js       | 6 +++---
 src/public/javascripts/widgets/note_detail.js       | 8 ++------
 src/public/javascripts/widgets/note_tree.js         | 2 +-
 src/public/javascripts/widgets/tab_aware_widget.js  | 2 ++
 src/public/javascripts/widgets/type_widgets/text.js | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/public/javascripts/dialogs/note_source.js b/src/public/javascripts/dialogs/note_source.js
index a5d0418c8..79bd00c09 100644
--- a/src/public/javascripts/dialogs/note_source.js
+++ b/src/public/javascripts/dialogs/note_source.js
@@ -4,12 +4,12 @@ import utils from "../services/utils.js";
 const $dialog = $("#note-source-dialog");
 const $noteSource = $("#note-source");
 
-export function showDialog() {
+export async function showDialog() {
     utils.openDialog($dialog);
 
-    const noteText = appContext.tabManager.getActiveTabNote().content;
+    const noteCompletement = await appContext.tabManager.getActiveTabContext().getNoteComplement();
 
-    $noteSource.text(formatHtml(noteText));
+    $noteSource.text(formatHtml(noteCompletement.content));
 }
 
 function formatHtml(str) {
diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/javascripts/widgets/note_detail.js
index d93976c5e..b85508482 100644
--- a/src/public/javascripts/widgets/note_detail.js
+++ b/src/public/javascripts/widgets/note_detail.js
@@ -102,8 +102,7 @@ export default class NoteDetailWidget extends TabAwareWidget {
 
             const typeWidget = this.typeWidgets[this.type] = new clazz();
             typeWidget.spacedUpdate = this.spacedUpdate;
-
-            this.child(typeWidget);
+            typeWidget.setParent(this);
 
             const $renderedWidget = typeWidget.render();
             keyboardActionsService.updateDisplayedShortcuts($renderedWidget);
@@ -112,10 +111,7 @@ export default class NoteDetailWidget extends TabAwareWidget {
 
             await typeWidget.handleEvent('setTabContext', {tabContext: this.tabContext});
 
-            typeWidget.handleEvent('tabNoteSwitched', {
-                tabId: this.tabContext.tabId,
-                notePath: this.notePath
-            });
+            this.child(typeWidget);
         }
 
         this.setupClasses();
diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index 94528813c..75ced6fae 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -421,7 +421,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
     collapseTreeCommand() { this.collapseTree(); }
 
     isEnabled() {
-        return this.tabContext && this.tabContext.isActive();
+        return !!this.tabContext;
     }
 
     async refresh() {
diff --git a/src/public/javascripts/widgets/tab_aware_widget.js b/src/public/javascripts/widgets/tab_aware_widget.js
index 1dad9ccd3..5586e4501 100644
--- a/src/public/javascripts/widgets/tab_aware_widget.js
+++ b/src/public/javascripts/widgets/tab_aware_widget.js
@@ -80,6 +80,8 @@ export default class TabAwareWidget extends BasicWidget {
     setTabContextEvent({tabContext}) {
         /** @var {TabContext} */
         this.tabContext = tabContext;
+
+        this.refresh();
     }
 
     async newTabOpenedEvent({tabContext}) {
diff --git a/src/public/javascripts/widgets/type_widgets/text.js b/src/public/javascripts/widgets/type_widgets/text.js
index 216feeab6..101af8cee 100644
--- a/src/public/javascripts/widgets/type_widgets/text.js
+++ b/src/public/javascripts/widgets/type_widgets/text.js
@@ -143,7 +143,7 @@ export default class TextTypeWidget extends TypeWidget {
     async doRefresh(note) {
         this.textEditor.isReadOnly = await note.hasLabel('readOnly');
 
-        const noteComplement = await this.tabContext.getNoteComplement();
+        const noteComplement = await treeCache.getNoteComplement(note.noteId);
 
         await this.spacedUpdate.allowUpdateWithoutChange(() => {
             this.textEditor.setData(noteComplement.content);