release 0.40.4

# Conflicts:
#	package.json
#	src/services/build.js

.idea/dataSources.xml

@@ -6,9 +6,6 @@
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
     </data-source>
   </component>
 </project>

electron.js

@@ -26,9 +26,9 @@ app.on('ready', async () => {
 
     await sqlInit.dbConnection;
 
-    // if schema doesn't exist -> setup process
-    // if schema exists, then we need to wait until the migration process is finished
-    if (await sqlInit.schemaExists()) {
+    // if db is not initialized -> setup process
+    // if db is initialized, then we need to wait until the migration process is finished
+    if (await sqlInit.isDbInitialized()) {
         await sqlInit.dbReady;
 
         await windowService.createMainWindow();

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.40.0-beta",
+  "version": "0.40.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.40.1",
+  "version": "0.40.4",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/entities/note.js

@@ -811,8 +811,10 @@ class Note extends Entity {
             FROM attributes 
             WHERE noteId = ? AND 
                   isDeleted = 0 AND 
-                  type = 'relation' AND 
-                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
+                  ((type = 'relation' AND 
+                    name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'))
+                  OR
+                   (type = 'label' AND name = 'externalLink'))`, [this.noteId]);
     }
 
     /**

src/public/javascripts/dialogs/about.js

@@ -10,8 +10,6 @@ const $buildRevision = $("#build-revision");
 const $dataDirectory = $("#data-directory");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
     const appInfo = await server.get('app-info');
 
     $appVersion.text(appInfo.appVersion);
@@ -22,7 +20,5 @@ export async function showDialog() {
     $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision);
     $dataDirectory.text(appInfo.dataDirectory);
 
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 }

src/public/javascripts/dialogs/add_link.js

@@ -11,13 +11,9 @@ const $linkTitle = $("#link-title");
 const $addLinkTitleFormGroup = $("#add-link-title-form-group");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
     $addLinkTitleFormGroup.toggle(!hasSelection());
 
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     $autoComplete.val('').trigger('focus');
     $linkTitle.val('');

src/public/javascripts/dialogs/attributes.js

@@ -287,8 +287,6 @@ function initKoPlugins() {
 }
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
     await libraryLoader.requireLibrary(libraryLoader.KNOCKOUT);
 
     // lazily apply bindings on first use
@@ -300,11 +298,9 @@ export async function showDialog() {
         ko.applyBindings(attributesModel, $dialog[0]);
     }
 
-    glob.activeDialog = $dialog;
-
     await attributesModel.loadAttributes();
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 }
 
 $dialog.on('focus', '.attribute-name', function (e) {

src/public/javascripts/dialogs/backend_log.js

@@ -6,11 +6,7 @@ const $backendLogTextArea = $("#backend-log-textarea");
 const $refreshBackendLog = $("#refresh-backend-log-button");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     load();
 }

src/public/javascripts/dialogs/branch_prefix.js

@@ -13,10 +13,6 @@ const $noteTitle = $('#branch-prefix-note-title');
 let branchId;
 
 export async function showDialog(node) {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     branchId = node.data.branchId;
     const branch = treeCache.getBranch(branchId);
 
@@ -30,7 +26,7 @@ export async function showDialog(node) {
         return;
     }
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     $treePrefixInput.val(branch.prefix);
 

src/public/javascripts/dialogs/clone_to.js

@@ -22,11 +22,7 @@ export async function showDialog(noteIds) {
         }
     }
 
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     $noteAutoComplete.val('').trigger('focus');
 

src/public/javascripts/dialogs/export.js

@@ -17,8 +17,6 @@ let taskId = '';
 let branchId = null;
 
 export async function showDialog(node, defaultType) {
-    utils.closeActiveDialog();
-
     // each opening of the dialog resets the taskId so we don't associate it with previous exports anymore
     taskId = '';
     $exportButton.removeAttr("disabled");
@@ -38,9 +36,7 @@ export async function showDialog(node, defaultType) {
 
     $("#opml-v2").prop("checked", true); // setting default
 
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     branchId = node.data.branchId;
 

src/public/javascripts/dialogs/help.js

@@ -3,9 +3,5 @@ import utils from "../services/utils.js";
 const $dialog = $("#help-dialog");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 }

src/public/javascripts/dialogs/import.js

@@ -16,8 +16,6 @@ const $explodeArchivesCheckbox = $("#explode-archives-checkbox");
 let parentNoteId = null;
 
 export async function showDialog(node) {
-    utils.closeActiveDialog();
-
     $fileUploadInput.val('').trigger('change'); // to trigger Import button disabling listener below
 
     $safeImportCheckbox.prop("checked", true);
@@ -26,13 +24,11 @@ export async function showDialog(node) {
     $codeImportedAsCodeCheckbox.prop("checked", true);
     $explodeArchivesCheckbox.prop("checked", true);
 
-    glob.activeDialog = $dialog;
-
     parentNoteId = node.data.noteId;
 
     $noteTitle.text(await treeUtils.getNoteTitle(parentNoteId));
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 }
 
 $form.on('submit', () => {

src/public/javascripts/dialogs/include_note.js

@@ -10,13 +10,9 @@ let callback = null;
 export async function showDialog(cb) {
     callback = cb;
 
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     $autoComplete.val('');
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     noteAutocompleteService.initNoteAutocomplete($autoComplete, { hideGoToSelectedNoteButton: true });
     noteAutocompleteService.showRecentNotes($autoComplete);

src/public/javascripts/dialogs/info.js

@@ -10,13 +10,9 @@ let $originallyFocused; // element focused before the dialog was opened so we ca
 export function info(message) {
     $originallyFocused = $(':focus');
 
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     $infoContent.text(message);
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     return new Promise((res, rej) => { resolve = res; });
 }

src/public/javascripts/dialogs/jump_to_note.js

@@ -8,13 +8,9 @@ const $autoComplete = $("#jump-to-note-autocomplete");
 const $showInFullTextButton = $("#show-in-full-text-button");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     $autoComplete.val('');
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     noteAutocompleteService.initNoteAutocomplete($autoComplete, { hideGoToSelectedNoteButton: true })
         .on('autocomplete:selected', function(event, suggestion, dataset) {

src/public/javascripts/dialogs/link_map.js

@@ -16,10 +16,6 @@ function getOptions() {
 }
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     // set default settings
     $maxNotesInput.val(20);
 
@@ -27,7 +23,7 @@ export async function showDialog() {
 
     $linkMapContainer.empty();
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 }
 
 $dialog.on('shown.bs.modal', () => {

src/public/javascripts/dialogs/markdown_import.js

@@ -37,9 +37,7 @@ export async function importMarkdownInline() {
         convertMarkdownToHtml(text);
     }
     else {
-        glob.activeDialog = $dialog;
-
-        $dialog.modal();
+        utils.openDialog($dialog);
     }
 }
 

src/public/javascripts/dialogs/move_to.js

@@ -1,7 +1,5 @@
 import noteAutocompleteService from "../services/note_autocomplete.js";
 import utils from "../services/utils.js";
-import cloningService from "../services/cloning.js";
-import treeUtils from "../services/tree_utils.js";
 import toastService from "../services/toast.js";
 import treeCache from "../services/tree_cache.js";
 import treeChangesService from "../services/branches.js";
@@ -18,11 +16,7 @@ let movedNodes;
 export async function showDialog(nodes) {
     movedNodes = nodes;
 
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     $noteAutoComplete.val('').trigger('focus');
 

src/public/javascripts/dialogs/note_info.js

@@ -10,11 +10,7 @@ const $mime = $("#note-info-mime");
 const $okButton = $("#note-info-ok-button");
 
 export function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     const activeNote = noteDetailService.getActiveTabNote();
 

src/public/javascripts/dialogs/note_revisions.js

@@ -29,11 +29,7 @@ export async function showCurrentNoteRevisions() {
 }
 
 export async function showNoteRevisionsDialog(noteId, noteRevisionId) {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     await loadNoteRevisions(noteId, noteRevisionId);
 }

src/public/javascripts/dialogs/note_source.js

@@ -5,11 +5,7 @@ const $dialog = $("#note-source-dialog");
 const $noteSource = $("#note-source");
 
 export function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     const noteText = noteDetailService.getActiveTabNote().content;
 

src/public/javascripts/dialogs/options.js

@@ -6,13 +6,9 @@ import utils from "../services/utils.js";
 const $dialog = $("#options-dialog");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     const options = await server.get('options');
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     (await Promise.all([
         import('./options/advanced.js'),

src/public/javascripts/dialogs/prompt.js

@@ -12,10 +12,6 @@ let resolve;
 let shownCb;
 
 export function ask({ message, defaultValue, shown }) {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     shownCb = shown;
 
     $question = $("<label>")
@@ -34,7 +30,7 @@ export function ask({ message, defaultValue, shown }) {
             .append($question)
             .append($answer));
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     return new Promise((res, rej) => { resolve = res; });
 }

src/public/javascripts/dialogs/protected_session.js

@@ -1,11 +1,12 @@
 import protectedSessionService from "../services/protected_session.js";
+import utils from "../services/utils.js";
 
 const $dialog = $("#protected-session-password-dialog");
 const $passwordForm = $dialog.find(".protected-session-password-form");
 const $passwordInput = $dialog.find(".protected-session-password");
 
 export function show() {
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     $passwordInput.trigger('focus');
 }

src/public/javascripts/dialogs/recent_changes.js

@@ -8,11 +8,7 @@ const $dialog = $("#recent-changes-dialog");
 const $content = $("#recent-changes-content");
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
-    $dialog.modal();
+    utils.openDialog($dialog);
 
     const result = await server.get('recent-changes');
 

src/public/javascripts/dialogs/sql_console.js

@@ -14,13 +14,9 @@ let codeEditor;
 $dialog.on("shown.bs.modal", e => initEditor());
 
 export async function showDialog() {
-    utils.closeActiveDialog();
-
-    glob.activeDialog = $dialog;
-
     await showTableSchemas();
 
-    $dialog.modal();
+    utils.openDialog($dialog);
 }
 
 async function initEditor() {

src/public/javascripts/mobile.js

@@ -7,9 +7,26 @@ import contextMenuWidget from "./services/context_menu.js";
 import treeChangesService from "./services/branches.js";
 import utils from "./services/utils.js";
 import treeUtils from "./services/tree_utils.js";
+import linkService from "./services/link.js";
+import noteContentRenderer from "./services/note_content_renderer.js";
 
 window.glob.isDesktop = utils.isDesktop;
 window.glob.isMobile = utils.isMobile;
+window.glob.showAddLinkDialog = () => import('./dialogs/add_link.js').then(d => d.showDialog());
+window.glob.showIncludeNoteDialog = cb => import('./dialogs/include_note.js').then(d => d.showDialog(cb));
+window.glob.loadIncludedNote = async (noteId, el) => {
+    const note = await treeCache.getNote(noteId);
+
+    if (note) {
+        $(el).empty().append($("<h3>").append(await linkService.createNoteLink(note.noteId, {
+            showTooltip: false
+        })));
+
+        const {renderedContent} = await noteContentRenderer.getRenderedContent(note);
+
+        $(el).append(renderedContent);
+    }
+};
 
 const $leftPane = $("#left-pane");
 const $tree = $("#tree");
@@ -87,6 +104,8 @@ async function showTree() {
             });
         }
     });
+
+    treeService.setTree($.ui.fancytree.getTree("#tree"));
 }
 
 $detail.on("click", ".note-menu-button", async e => {

src/public/javascripts/services/note_content_renderer.js

@@ -7,31 +7,20 @@ import protectedSessionHolder from "./protected_session_holder.js";
 async function getRenderedContent(note) {
     const type = getRenderingType(note);
 
-    let rendered;
+    let $rendered;
 
     if (type === 'text') {
         const fullNote = await server.get('notes/' + note.noteId);
 
-        const $content = $("<div>").html(fullNote.content);
-
-        if (utils.isHtmlEmpty(fullNote.content)) {
-            rendered = "";
-        }
-        else {
-            rendered = $content;
-        }
+        $rendered = $("<div>").html(fullNote.content);
     }
     else if (type === 'code') {
         const fullNote = await server.get('notes/' + note.noteId);
 
-        if (fullNote.content.trim() === "") {
-            rendered = "";
-        }
-
-        rendered = $("<pre>").text(fullNote.content);
+        $rendered = $("<pre>").text(fullNote.content);
     }
     else if (type === 'image') {
-        rendered = $("<img>").attr("src", `api/images/${note.noteId}/${note.title}`);
+        $rendered = $("<img>").attr("src", `api/images/${note.noteId}/${note.title}`);
     }
     else if (type === 'file') {
         function getFileUrl() {
@@ -56,33 +45,35 @@ async function getRenderedContent(note) {
         // open doesn't work for protected notes since it works through browser which isn't in protected session
         $openButton.toggle(!note.isProtected);
 
-        rendered = $('<div>')
+        $rendered = $('<div>')
             .append($downloadButton)
             .append(' &nbsp; ')
             .append($openButton);
     }
     else if (type === 'render') {
-        const $el = $('<div>');
+        $rendered = $('<div>');
 
-        await renderService.render(note, $el, this.ctx);
-
-        rendered = $el;
+        await renderService.render(note, $rendered, this.ctx);
     }
     else if (type === 'protected-session') {
         const $button = $(`<button class="btn btn-sm"><span class="bx bx-log-in"></span> Enter protected session</button>`)
             .on('click', protectedSessionService.enterProtectedSession);
 
-        rendered = $("<div>")
+        $rendered = $("<div>")
             .append("<div>This note is protected and to access it you need to enter password.</div>")
             .append("<br/>")
             .append($button);
     }
     else {
-        rendered = "<em>Content of this note cannot be displayed in the book format</em>";
+        $rendered = $("<em>Content of this note cannot be displayed in the book format</em>");
+    }
+
+    if (note.cssClass) {
+        $rendered.addClass(note.cssClass);
     }
 
     return {
-        renderedContent: rendered,
+        renderedContent: $rendered,
         type
     };
 }

src/public/javascripts/services/search_notes.js

@@ -2,6 +2,7 @@ import treeService from './tree.js';
 import treeCache from "./tree_cache.js";
 import server from './server.js';
 import toastService from "./toast.js";
+import utils from "./utils.js";
 
 const $searchInput = $("input[name='search-text']");
 const $resetSearchButton = $("#reset-search-button");
@@ -28,6 +29,8 @@ const helpText = `
 </p>`;
 
 function showSearch() {
+    utils.saveFocusedElement();
+
     $searchBox.slideDown();
 
     $searchBox.tooltip({
@@ -49,6 +52,8 @@ function hideSearch() {
 
     $searchResults.hide();
     $searchBox.slideUp();
+
+    utils.focusSavedElement();
 }
 
 function toggleSearch() {

src/public/javascripts/services/sidebar.js

@@ -5,6 +5,7 @@ import splitService from "./split.js";
 import optionService from "./options.js";
 import server from "./server.js";
 import noteDetailService from "./note_detail.js";
+import utils from "./utils.js";
 
 const $sidebar = $("#right-pane");
 const $sidebarContainer = $('#sidebar-container');
@@ -15,6 +16,10 @@ const $hideSidebarButton = $("#hide-sidebar-button");
 optionService.waitForOptions().then(options => toggleSidebar(options.is('rightPaneVisible')));
 
 function toggleSidebar(show) {
+    if (utils.isMobile()) {
+        return;
+    }
+
     $sidebar.toggle(show);
     $showSidebarButton.toggle(!show);
     $hideSidebarButton.toggle(show);

src/public/javascripts/services/tab_context.js

@@ -303,7 +303,11 @@ class TabContext {
 
         let type = this.note.type;
 
-        if (type === 'text' && !disableAutoBook && utils.isHtmlEmpty(this.note.content) && this.note.hasChildren()) {
+        if (type === 'text'
+            && !disableAutoBook
+            && utils.isHtmlEmpty(this.note.content)
+            && this.note.hasChildren()
+            && utils.isDesktop()) {
             type = 'book';
         }
 

src/public/javascripts/services/tree.js

@@ -635,7 +635,7 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) {
         extraOptions.saveSelection = false;
     }
 
-    if (extraOptions.saveSelection) {
+    if (extraOptions.saveSelection && utils.isCKEditorInitialized()) {
         [extraOptions.title, extraOptions.content] = parseSelectedHtml(window.cutToNote.getSelectedHtml());
     }
 
@@ -648,7 +648,7 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) {
         type: extraOptions.type
     });
 
-    if (extraOptions.saveSelection) {
+    if (extraOptions.saveSelection && utils.isCKEditorInitialized()) {
         // we remove the selection only after it was saved to server to make sure we don't lose anything
         window.cutToNote.removeSelection();
     }
@@ -870,7 +870,7 @@ window.glob.cutIntoNote = () => createNoteInto(true);
 
 keyboardActionService.setGlobalActionHandler('CutIntoNote', () => createNoteInto(true));
 
-keyboardActionService.setGlobalActionHandler('CreateNoteInto', createNoteInto);
+keyboardActionService.setGlobalActionHandler('CreateNoteInto', () => createNoteInto(true));
 
 keyboardActionService.setGlobalActionHandler('ScrollToActiveNote', scrollToActiveNote);
 
@@ -913,6 +913,10 @@ function getNodeByKey(key) {
     return tree.getNodeByKey(key);
 }
 
+function setTree(treeInstance) {
+    tree = treeInstance;
+}
+
 keyboardActionService.setGlobalActionHandler('CollapseTree', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
 $collapseTreeButton.on('click', () => collapseTree());
 
@@ -949,5 +953,6 @@ export default {
     focusTree,
     scrollToActiveNote,
     duplicateNote,
-    getNodeByKey
+    getNodeByKey,
+    setTree
 };

src/public/javascripts/services/tree_context_menu.js

@@ -62,6 +62,11 @@ class TreeContextMenu {
             !isHoisted || !isNotRoot ? null : { title: 'Unhoist note <kbd data-kb-action="ToggleNoteHoisting"></kbd>', cmd: "unhoist", uiIcon: "arrow-up" },
             { title: 'Edit branch prefix <kbd data-kb-action="EditBranchPrefix"></kbd>', cmd: "editBranchPrefix", uiIcon: "empty",
                 enabled: isNotRoot && parentNotSearch && noSelectedNotes},
+            { title: "Advanced", uiIcon: "empty", enabled: true, items: [
+                    { title: 'Collapse subtree <kbd data-kb-action="CollapseSubtree"></kbd>', cmd: "collapseSubtree", uiIcon: "align-justify", enabled: noSelectedNotes },
+                    { title: "Force note sync", cmd: "forceNoteSync", uiIcon: "recycle", enabled: noSelectedNotes },
+                    { title: 'Sort alphabetically <kbd data-kb-action="SortChildNotes"></kbd>', cmd: "sortAlphabetically", uiIcon: "empty", enabled: noSelectedNotes && notSearch }
+                ] },
             { title: "----" },
             { title: "Protect subtree", cmd: "protectSubtree", uiIcon: "check-shield", enabled: noSelectedNotes },
             { title: "Unprotect subtree", cmd: "unprotectSubtree", uiIcon: "shield", enabled: noSelectedNotes },
@@ -84,12 +89,7 @@ class TreeContextMenu {
             { title: "Export", cmd: "export", uiIcon: "empty",
                 enabled: notSearch && noSelectedNotes },
             { title: "Import into note", cmd: "importIntoNote", uiIcon: "empty",
-                enabled: notSearch && noSelectedNotes },
-            { title: "Advanced", uiIcon: "empty", enabled: true, items: [
-                    { title: 'Collapse subtree <kbd data-kb-action="CollapseSubtree"></kbd>', cmd: "collapseSubtree", uiIcon: "align-justify", enabled: noSelectedNotes },
-                    { title: "Force note sync", cmd: "forceNoteSync", uiIcon: "recycle", enabled: noSelectedNotes },
-                    { title: 'Sort alphabetically <kbd data-kb-action="SortChildNotes"></kbd>', cmd: "sortAlphabetically", uiIcon: "empty", enabled: noSelectedNotes && notSearch }
-                ] },
+                enabled: notSearch && noSelectedNotes }
         ].filter(row => row !== null);
     }
 

src/public/javascripts/services/utils.js

@@ -209,9 +209,50 @@ function getMimeTypeClass(mime) {
 function closeActiveDialog() {
     if (glob.activeDialog) {
         glob.activeDialog.modal('hide');
+        glob.activeDialog = null;
     }
 }
 
+let $lastFocusedElement = null;
+
+function saveFocusedElement() {
+    $lastFocusedElement = $(":focus");
+}
+
+function focusSavedElement() {
+    if (!$lastFocusedElement) {
+        return;
+    }
+
+    if ($lastFocusedElement.hasClass("ck")) {
+        // must handle CKEditor separately because of this bug: https://github.com/ckeditor/ckeditor5/issues/607
+
+        import("./note_detail.js").then(noteDetail => {
+            noteDetail.default.getActiveEditor().editing.view.focus();
+        });
+    } else {
+        $lastFocusedElement.focus();
+    }
+
+    $lastFocusedElement = null;
+}
+
+function openDialog($dialog) {
+    closeActiveDialog();
+
+    glob.activeDialog = $dialog;
+
+    saveFocusedElement();
+
+    $dialog.modal();
+
+    $dialog.on('hidden.bs.modal', () => {
+        if (!glob.activeDialog || glob.activeDialog === $dialog) {
+            focusSavedElement();
+        }
+    });
+}
+
 function isHtmlEmpty(html) {
     html = html.toLowerCase();
 
@@ -248,6 +289,10 @@ function copySelectionToClipboard() {
     }
 }
 
+function isCKEditorInitialized() {
+    return !!(window && window.cutToNote);
+}
+
 export default {
     reloadApp,
     parseDate,
@@ -277,9 +322,13 @@ export default {
     getNoteTypeClass,
     getMimeTypeClass,
     closeActiveDialog,
+    openDialog,
+    saveFocusedElement,
+    focusSavedElement,
     isHtmlEmpty,
     clearBrowserCache,
     getUrlForDownload,
     normalizeShortcut,
-    copySelectionToClipboard
+    copySelectionToClipboard,
+    isCKEditorInitialized
 };

src/public/javascripts/widgets/attributes.js

@@ -71,7 +71,19 @@ class AttributesWidget extends StandardWidget {
     async renderAttributes(attributes, $container) {
         for (const attribute of attributes) {
             if (attribute.type === 'label') {
-                $container.append(utils.formatLabel(attribute) + " ");
+                if (attribute.name === 'externalLink') {
+                    $container.append('@' + attribute.name + "=");
+                    $container.append(
+                        $('<a>')
+                            .text(attribute.value)
+                            .attr('href', attribute.value)
+                            .addClass('external')
+                    );
+                    $container.append(" ");
+                }
+                else {
+                    $container.append(utils.formatLabel(attribute) + " ");
+                }
             } else if (attribute.type === 'relation') {
                 if (attribute.value) {
                     $container.append('@' + attribute.name + "=");

src/public/javascripts/widgets/calendar.js

@@ -41,7 +41,7 @@ class CalendarWidget extends StandardWidget {
     }
 
     init($el, activeDate) {
-        this.activeDate = new Date(Date.parse(activeDate));
+        this.activeDate = new Date(activeDate + "T12:00:00"); // attaching time fixes local timezone handling
         this.todaysDate = new Date();
         this.date = new Date(this.activeDate.getTime());
 

src/public/stylesheets/style.css

@@ -897,7 +897,7 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     text-align: center;
 }
 
-.note-book-card.type-image .note-book-content img {
+.note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img {
     max-width: 100%;
     max-height: 100%;
 }

src/routes/api/clipper.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const attributeService = require("../../services/attributes");
 const noteService = require('../../services/notes');
 const dateNoteService = require('../../services/date_notes');
 const dateUtils = require('../../services/date_utils');
@@ -23,16 +24,26 @@ async function findClippingNote(todayNote, pageUrl) {
     return null;
 }
 
+async function getClipperInboxNote() {
+    let clipperInbox = await attributeService.getNoteWithLabel('clipperInbox');
+
+    if (!clipperInbox) {
+        clipperInbox = await dateNoteService.getDateNote(dateUtils.localNowDate());
+    }
+
+    return clipperInbox;
+}
+
 async function addClipping(req) {
     const {title, content, pageUrl, images} = req.body;
 
-    const todayNote = await dateNoteService.getDateNote(dateUtils.localNowDate());
+    const clipperInbox = await getClipperInboxNote();
 
-    let clippingNote = await findClippingNote(todayNote, pageUrl);
+    let clippingNote = await findClippingNote(clipperInbox, pageUrl);
 
     if (!clippingNote) {
         clippingNote = (await noteService.createNewNote({
-            parentNoteId: todayNote.noteId,
+            parentNoteId: clipperInbox.noteId,
             title: title,
             content: '',
             type: 'text'
@@ -54,10 +65,10 @@ async function addClipping(req) {
 async function createNote(req) {
     const {title, content, pageUrl, images, clipType} = req.body;
 
-    const todayNote = await dateNoteService.getDateNote(dateUtils.localNowDate());
+    const clipperInbox = await getClipperInboxNote();
 
     const {note} = await noteService.createNewNote({
-        parentNoteId: todayNote.noteId,
+        parentNoteId: clipperInbox.noteId,
         title,
         content,
         type: 'text'

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-01-19T15:45:06+01:00", buildRevision: "ab535bf147edac113299f76f410ff88b2c06735b" };
+module.exports = { buildDate:"2020-02-24T22:59:22+01:00", buildRevision: "fb55cdaea6b1367129e11118b8b6fd2eadebad5f" };

src/services/cloning.js

@@ -7,6 +7,7 @@ const noteService = require('./notes');
 const repository = require('./repository');
 const Branch = require('../entities/branch');
 const TaskContext = require("./task_context.js");
+const utils = require('./utils');
 
 async function cloneNoteToParent(noteId, parentNoteId, prefix) {
     if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) {
@@ -54,7 +55,8 @@ async function ensureNoteIsAbsentFromParent(noteId, parentNoteId) {
     const branch = await repository.getEntity(`SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]);
 
     if (branch) {
-        await noteService.deleteBranch(branch, new TaskContext());
+        const deleteId = utils.randomString(10);
+        await noteService.deleteBranch(branch, deleteId, new TaskContext());
     }
 }
 

src/services/consistency_checks.js

@@ -323,14 +323,25 @@ class ConsistencyChecks {
                     WHERE isErased = 1
                       AND content IS NOT NULL`,
             async ({noteId}) => {
-            if (this.autoFix) {
-                await sql.execute(`UPDATE note_contents SET content = NULL WHERE noteId = ?`, [noteId]);
 
-                logFix(`Note ${noteId} content has been set to null since the note is erased`);
-            }
-            else {
-                logError(`Note ${noteId} content is not null even though the note is erased`);
-            }
+            // we always fix this issue because there does not seem to be a good way to prevent it.
+            // Scenario in which this can happen:
+            // 1. user on instance A deletes the note (sync for notes is created, but not for note_contents) and is later erased
+            // 2. instance B gets synced from instance A, note is updated because of sync row for notes,
+            //    but note_contents is not because erasion does not create sync rows
+            // 3. therefore note.isErased = true, but note_contents.content remains not updated and not erased.
+            //
+            // Considered solutions:
+            // - don't sync erased notes - this might prevent syncing also of the isDeleted flag and note would continue
+            //   to exist on the other instance
+            // - create sync rows for erased event - this would be a problem for undeletion since erasion might happen
+            //   on one instance after undelete and thus would win even though there's no user action behind it
+            //
+            // So instead we just fix such cases afterwards here.
+
+            await sql.execute(`UPDATE note_contents SET content = NULL WHERE noteId = ?`, [noteId]);
+
+            logFix(`Note ${noteId} content has been set to null since the note is erased`);
         });
 
         await this.findAndFixIssues(`
@@ -547,23 +558,23 @@ class ConsistencyChecks {
             });
 
         await this.findAndFixIssues(`
-        SELECT 
-          id, entityId
-        FROM 
-          sync 
-          LEFT JOIN ${entityName} ON entityId = ${key} 
-        WHERE 
-          sync.entityName = '${entityName}' 
-          AND ${key} IS NULL`,
-            async ({id, entityId}) => {
-                if (this.autoFix) {
-                    await sql.execute("DELETE FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
+            SELECT 
+              id, entityId
+            FROM 
+              sync 
+              LEFT JOIN ${entityName} ON entityId = ${key} 
+            WHERE 
+              sync.entityName = '${entityName}' 
+              AND ${key} IS NULL`,
+                async ({id, entityId}) => {
+                    if (this.autoFix) {
+                        await sql.execute("DELETE FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
 
-                    logFix(`Deleted extra sync record id=${id}, entityName=${entityName}, entityId=${entityId}`);
-                } else {
-                    logError(`Unrecognized sync record id=${id}, entityName=${entityName}, entityId=${entityId}`);
-                }
-            });
+                        logFix(`Deleted extra sync record id=${id}, entityName=${entityName}, entityId=${entityId}`);
+                    } else {
+                        logError(`Unrecognized sync record id=${id}, entityName=${entityName}, entityId=${entityId}`);
+                    }
+                });
     }
 
     async findSyncRowsIssues() {

src/services/import/tar.js

@@ -152,6 +152,11 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
                 continue;
             }
 
+            if (attr.type === 'label' && attr.name === 'externalLink') {
+                // also created automatically
+                continue;
+            }
+
             if (attr.type === 'relation') {
                 attr.value = getNewNoteId(attr.value);
             }

src/services/notes.js

@@ -242,6 +242,20 @@ function findInternalLinks(content, foundLinks) {
     return content.replace(/href="[^"]*#root/g, 'href="#root');
 }
 
+function findExternalLinks(content, foundLinks) {
+    const re = /href="([a-zA-Z]+:\/\/[^"]*)"/g;
+    let match;
+
+    while (match = re.exec(content)) {
+        foundLinks.push({
+            name: 'externalLink',
+            value: match[1]
+        });
+    }
+
+    return content;
+}
+
 function findIncludeNoteLinks(content, foundLinks) {
     const re = /<section class="include-note" data-note-id="([a-zA-Z0-9]+)">/g;
     let match;
@@ -281,6 +295,7 @@ async function saveLinks(note, content) {
     if (note.type === 'text') {
         content = findImageLinks(content, foundLinks);
         content = findInternalLinks(content, foundLinks);
+        content = findExternalLinks(content, foundLinks);
         content = findIncludeNoteLinks(content, foundLinks);
     }
     else if (note.type === 'relation-map') {
@@ -293,9 +308,11 @@ async function saveLinks(note, content) {
     const existingLinks = await note.getLinks();
 
     for (const foundLink of foundLinks) {
-        const targetNote = await repository.getNote(foundLink.value);
-        if (!targetNote || targetNote.isDeleted) {
-            continue;
+        if (foundLink.name !== 'externalLink') {
+            const targetNote = await repository.getNote(foundLink.value);
+            if (!targetNote || targetNote.isDeleted) {
+                continue;
+            }
         }
 
         const existingLink = existingLinks.find(existingLink =>
@@ -305,7 +322,7 @@ async function saveLinks(note, content) {
         if (!existingLink) {
             await new Attribute({
                 noteId: note.noteId,
-                type: 'relation',
+                type: foundLink.name === 'externalLink' ? 'label' : 'relation',
                 name: foundLink.name,
                 value: foundLink.value,
             }).save();
@@ -582,6 +599,7 @@ async function eraseDeletedNotes() {
         UPDATE notes 
         SET title = '[deleted]',
             contentLength = 0,
+            isProtected = 0,
             isErased = 1
         WHERE noteId IN (???)`, noteIdsToErase);
 

src/services/sync.js

@@ -228,9 +228,10 @@ async function syncFinished(syncContext) {
 
 async function checkContentHash(syncContext) {
     const resp = await syncRequest(syncContext, 'GET', '/api/sync/check');
+    const lastSyncedPullId = await getLastSyncedPull();
 
-    if (await getLastSyncedPull() < resp.maxSyncId) {
-        log.info("There are some outstanding pulls, skipping content check.");
+    if (lastSyncedPullId < resp.maxSyncId) {
+        log.info(`There are some outstanding pulls (${lastSyncedPullId} vs. ${resp.maxSyncId}), skipping content check.`);
 
         return true;
     }

src/views/mobile.ejs

@@ -73,6 +73,8 @@
                         <% include details/relation_map.ejs %>
 
                         <% include details/protected_session_password.ejs %>
+
+                        <% include details/book.ejs %>
                     </div>
                 </div>
             </div>

src/views/setup.ejs

@@ -19,13 +19,13 @@
                 <label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType">
                     I'm a new user and I want to create new Trilium document for my notes</label>
             </div>
-            <div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;">
+            <div class="radio" style="margin-bottom: 15px;">
                 <label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
                     I have desktop instance already and I want to setup sync with it</label>
             </div>
-            <div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;">
+            <div class="radio" style="margin-bottom: 15px;">
                 <label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType">
-                    I have server instance up and I want to setup sync with it</label>
+                    I have server instance already and I want to setup sync with it</label>
             </div>
 
             <button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary">Next</button>