Merge branch 'zadam:master' into master

README.md

@@ -2,6 +2,8 @@
 
 ## Trilium is in maintenance mode - see details in https://github.com/zadam/trilium/issues/4620
 
+Preliminary disccusions on the successor organization are taking place in [Trilium Next discussions](https://github.com/orgs/TriliumNext/discussions). 
+
 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md)
 
 Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. 

package.json

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

src/public/app/services/hoisted_note.js

@@ -48,11 +48,11 @@ async function checkNoteAccess(notePath, noteContext) {
 
     const hoistedNoteId = noteContext.hoistedNoteId;
 
-    if (!resolvedNotePath.includes(hoistedNoteId) && !resolvedNotePath.includes('_hidden')) {
+    if (!resolvedNotePath.includes(hoistedNoteId) && (!resolvedNotePath.includes('_hidden') || resolvedNotePath.includes('_lbBookmarks'))) {
         const requestedNote = await froca.getNote(treeService.getNoteIdFromUrl(resolvedNotePath));
         const hoistedNote = await froca.getNote(hoistedNoteId);
 
-        if (!hoistedNote.hasAncestor('_hidden')
+        if ((!hoistedNote.hasAncestor('_hidden') || resolvedNotePath.includes('_lbBookmarks'))
             && !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
             return false;
         }

src/public/app/widgets/attribute_widgets/attribute_editor.js

@@ -200,7 +200,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
             this.attributeDetailWidget.hide();
         });
 
-        this.$editor.on('blur', () => this.save());
+        this.$editor.on('blur', () => setTimeout(() => this.save(), 100)); // Timeout to fix https://github.com/zadam/trilium/issues/4160
 
         this.$addNewAttributeButton = this.$widget.find('.add-new-attribute-button');
         this.$addNewAttributeButton.on('click', e => this.addNewAttribute(e));

src/services/backend_script_api.js

@@ -43,12 +43,16 @@ const optionsService = require('./options.js');
  */
 function BackendScriptApi(currentNote, apiParams) {
     /**
-     * Note where the script started executing
+     * Note where the script started executing (entrypoint).
+     * As an analogy, in C this would be the file which contains the main() function of the current process.
      * @type {BNote}
      */
     this.startNote = apiParams.startNote;
     /**
-     * Note where the script is currently executing. Don't mix this up with the concept of active note
+     * Note where the script is currently executing. This comes into play when your script is spread in multiple code
+     * notes, the script starts in "startNote", but then through function calls may jump into another note (currentNote).
+     * A similar concept in C would be __FILE__
+     * Don't mix this up with the concept of active note.
      * @type {BNote}
      */
     this.currentNote = currentNote;
@@ -288,7 +292,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {string} params.parentNoteId
      * @param {string} params.title
      * @param {string|Buffer} params.content
-     * @param {NoteType} params.type - text, code, file, image, search, book, relationMap, canvas
+     * @param {NoteType} params.type - text, code, file, image, search, book, relationMap, canvas, webView
      * @param {string} [params.mime] - value is derived from default mimes for type
      * @param {boolean} [params.isProtected=false]
      * @param {boolean} [params.isExpanded=false]

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2024-01-21T23:49:23+01:00", buildRevision: "4f8073daa7cff1b8b6737ae45792b2e87c2adf33" };
+module.exports = { buildDate:"2024-02-17T22:47:50+01:00", buildRevision: "15677f71785fd81298b94df70855233d1578629c" };

start-docker.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 [[ ! -z "${USER_UID}" ]] && usermod -u ${USER_UID} node || echo "No USER_UID specified, leaving 1000"
-[[ ! -z "${USER_GID}" ]] && groupmod -g ${USER_GID} node || echo "No USER_GID specified, leaving 1000"
+[[ ! -z "${USER_GID}" ]] && groupmod -og ${USER_GID} node || echo "No USER_GID specified, leaving 1000"
 
 chown -R node:node /home/node
 exec su-exec node node ./src/www