Merge branch 'stable'

# Conflicts:
#	src/services/notes.js

src/public/javascripts/services/context_menu.js

@@ -76,8 +76,7 @@ async function initContextMenu(event, contextMenu) {
     // in such case we'll position it above click coordinates so it will fit into client
     const clickPosition = event.pageY;
     const clientHeight = document.documentElement.clientHeight;
-    const contextMenuHeight = $contextMenuContainer.height();
-
+    const contextMenuHeight = $contextMenuContainer.outerHeight() + 30;
     let top;
 
     if (clickPosition + contextMenuHeight > clientHeight) {

src/public/javascripts/services/note_detail.js

@@ -201,17 +201,13 @@ async function loadNoteDetail(origNotePath, options = {}) {
     const newTab = !!options.newTab;
     const activate = !!options.activate;
 
-    const notePath = await treeService.resolveNotePath(origNotePath);
+    let notePath = await treeService.resolveNotePath(origNotePath);
 
     if (!notePath) {
         console.error(`Cannot resolve note path ${origNotePath}`);
 
         // fallback to display something
-        if (tabContexts.length === 0) {
-            await openEmptyTab();
-        }
-
-        return;
+        notePath = 'root';
     }
 
     const noteId = treeUtils.getNoteIdFromNotePath(notePath);

src/public/javascripts/services/note_detail_text.js

@@ -47,6 +47,7 @@ class NoteDetailText {
         this.ctx = ctx;
         this.$component = ctx.$tabContent.find('.note-detail-text');
         this.$editorEl = this.$component.find('.note-detail-text-editor');
+        this.textEditorPromise = null;
         this.textEditor = null;
 
         this.$component.on("dblclick", "img", e => {
@@ -67,7 +68,23 @@ class NoteDetailText {
     }
 
     async render() {
-        if (!this.textEditor) {
+        if (!this.textEditorPromise) {
+            this.textEditorPromise = this.initEditor();
+        }
+
+        await this.textEditorPromise;
+
+        // lazy loading above can take time and tab might have been already switched to another note
+        if (this.ctx.note && this.ctx.note.type === 'text') {
+            this.textEditor.isReadOnly = await this.isReadOnly();
+
+            this.$component.show();
+
+            this.textEditor.setData(this.ctx.note.content);
+        }
+    }
+
+    async initEditor() {
         await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);
 
         const codeBlockLanguages =
@@ -85,10 +102,7 @@ class NoteDetailText {
         // display of $component in both branches.
         this.$component.show();
 
-            // textEditor might have been initialized during previous await so checking again
-            // looks like double initialization can freeze CKEditor pretty badly
-            if (!this.textEditor) {
-                this.textEditor = await BalloonEditor.create(this.$editorEl[0], {
+        const textEditorInstance = await BalloonEditor.create(this.$editorEl[0], {
             placeholder: "Type the content of your note here ...",
             mention: mentionSetup,
             codeBlock: {
@@ -98,22 +112,13 @@ class NoteDetailText {
 
         if (glob.isDev && ENABLE_INSPECTOR) {
             await import('../../libraries/ckeditor/inspector.js');
-                    CKEditorInspector.attach(this.textEditor);
+            CKEditorInspector.attach(textEditorInstance);
         }
 
+        this.textEditor = textEditorInstance;
+
         this.onNoteChange(() => this.ctx.noteChanged());
     }
-        }
-
-        // lazy loading above can take time and tab might have been already switched to another note
-        if (this.ctx.note && this.ctx.note.type === 'text') {
-            this.textEditor.isReadOnly = await this.isReadOnly();
-
-            this.$component.show();
-
-            this.textEditor.setData(this.ctx.note.content);
-        }
-    }
 
     getContent() {
         const content = this.textEditor.getData();

src/public/javascripts/services/tab_context.js

@@ -350,8 +350,6 @@ class TabContext {
 
         this.$savedIndicator.fadeIn();
 
-        this.$scriptArea.empty();
-
         // run async
         bundleService.executeRelationBundles(this.note, 'runOnNoteChange', this);
 

src/public/stylesheets/desktop.css

@@ -110,7 +110,7 @@ body {
 
 #context-menu-container {
     max-height: 100vh;
-    overflow: auto; /* make it scrollable when exceeding total height of the window */
+    /* !!! Cannot set overflow: auto, submenus will break !!! */
 }
 
 #context-menu-container, #context-menu-container .dropdown-menu {

src/services/notes.js

@@ -594,6 +594,8 @@ async function eraseDeletedNotes() {
         SET name = 'deleted',
             value = ''
         WHERE noteId IN (???)`, noteIdsToErase);
+
+    log.info(`Erased notes: ${JSON.stringify(noteIdsToErase)}`);
 }
 
 async function duplicateNote(noteId, parentNoteId) {