Merge branch 'stable'

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.4",
+  "version": "0.33.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

src/public/javascripts/dialogs/confirm.js

@@ -7,8 +7,11 @@ const $custom = $("#confirm-dialog-custom");
 const DELETE_NOTE_BUTTON_ID = "confirm-dialog-delete-note";
 
 let resolve;
+let $originallyFocused; // element focused before the dialog was opened so we can return to it afterwards
 
 function confirm(message) {
+    $originallyFocused = $(':focus');
+
     $custom.hide();
 
     glob.activeDialog = $dialog;
@@ -55,6 +58,11 @@ $dialog.on("hidden.bs.modal", () => {
     if (resolve) {
         resolve(false);
     }
+
+    if ($originallyFocused) {
+        $originallyFocused.focus();
+        $originallyFocused = null;
+    }
 });
 
 function doResolve(ret) {

src/public/javascripts/dialogs/info.js

@@ -5,8 +5,11 @@ const $infoContent = $("#info-dialog-content");
 const $okButton = $("#info-dialog-ok-button");
 
 let resolve;
+let $originallyFocused; // element focused before the dialog was opened so we can return to it afterwards
 
 function info(message) {
+    $originallyFocused = $(':focus');
+
     utils.closeActiveDialog();
 
     glob.activeDialog = $dialog;
@@ -24,6 +27,11 @@ $dialog.on("hidden.bs.modal", () => {
     if (resolve) {
         resolve();
     }
+
+    if ($originallyFocused) {
+        $originallyFocused.focus();
+        $originallyFocused = null;
+    }
 });
 
 $okButton.click(() => $dialog.modal("hide"));

src/public/javascripts/services/branches.js

@@ -6,6 +6,7 @@ import treeCache from "./tree_cache.js";
 import treeUtils from "./tree_utils.js";
 import hoistedNoteService from "./hoisted_note.js";
 import noteDetailService from "./note_detail.js";
+import confirmDialog from "../dialogs/confirm.js";
 
 async function moveBeforeNode(nodesToMove, beforeNode) {
     nodesToMove = await filterRootNote(nodesToMove);
@@ -82,7 +83,7 @@ async function moveToNode(nodesToMove, toNode) {
 async function deleteNodes(nodes) {
     nodes = await filterRootNote(nodes);
 
-    if (nodes.length === 0 || !confirm('Are you sure you want to delete select note(s) and all the sub-notes?')) {
+    if (nodes.length === 0 || !await confirmDialog.confirm('Are you sure you want to delete select note(s) and all the sub-notes?')) {
         return false;
     }
 

src/public/javascripts/services/note_detail_text.js

@@ -74,7 +74,7 @@ class NoteDetailText {
     }
 
     focus() {
-        this.$component.focus();
+        this.$editorEl.focus();
     }
 
     getEditor() {

src/public/javascripts/services/tree.js

@@ -635,6 +635,8 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) {
     };
 
     if (target === 'after') {
+        console.log(`Appending node...`); // to debug duplicated nodes
+
         await node.appendSibling(newNode).setActive(true);
     }
     else if (target === 'into') {
@@ -642,6 +644,8 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) {
             await node.setExpanded();
         }
 
+        console.log(`Adding node as child...`); // to debug duplicated nodes
+
         node.addChildren(newNode);
 
         await node.getLastChild().setActive(true);

src/views/tabs.ejs

@@ -11,8 +11,8 @@
         <table class="note-detail-promoted-attributes"></table>
 
         <div class="note-detail-component-wrapper">
-            <div class="note-detail-text note-detail-component" tabindex="10000">
+            <div class="note-detail-text note-detail-component">
-                <div class="note-detail-text-editor"></div>
+                <div class="note-detail-text-editor" tabindex="10000"></div>
             </div>
 
             <div class="note-detail-code note-detail-component"></div>