From 493cd1a7e01e98be720370d0d2a5b65b0edc6d83 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 12 Aug 2019 22:25:42 +0200
Subject: [PATCH] better behavior of activateNote frontend script

---
 src/public/javascripts/services/frontend_script_api.js | 8 ++++++--
 src/public/javascripts/services/tree.js                | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/public/javascripts/services/frontend_script_api.js b/src/public/javascripts/services/frontend_script_api.js
index f766b95ba..af761d69f 100644
--- a/src/public/javascripts/services/frontend_script_api.js
+++ b/src/public/javascripts/services/frontend_script_api.js
@@ -40,9 +40,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      * @returns {Promise<void>}
      */
     this.activateNote = async (notePath, noteLoadedListener) => {
-        await treeService.activateNote(notePath, noteLoadedListener);
+        await treeService.activateNote(notePath, async () => {
+            await treeService.scrollToActiveNote();
 
-        await treeService.scrollToActiveNote();
+            if (noteLoadedListener) {
+                noteLoadedListener();
+            }
+        });
     };
 
     /**
diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js
index 1cc5093dc..d699f6fc8 100644
--- a/src/public/javascripts/services/tree.js
+++ b/src/public/javascripts/services/tree.js
@@ -562,7 +562,7 @@ async function collapseTree(node = null) {
 }
 
 function focusTree() {
-    $tree.find('.fancytree-container').focus();
+    getTree().setFocus();
 }
 
 async function scrollToActiveNote() {
@@ -573,8 +573,8 @@ async function scrollToActiveNote() {
 
         const node = await expandToNote(activeContext.notePath);
 
-        node.makeVisible({scrollIntoView: true});
-        node.setFocus(true);
+        await node.makeVisible({scrollIntoView: true});
+        node.setFocus();
     }
 }