From e9a2cacb5bb146cec0008009c909be4ad179c4fc Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Feb 2023 21:50:54 +0100 Subject: [PATCH 1/5] release 0.58.8 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 31521f91b..540a30a0d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.58.7", + "version": "0.58.8", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 10ff19a31..f43f7b683 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2023-01-17T23:14:58+01:00", buildRevision: "a3149aecf41bac3c559ebbd1865e916264985ac3" }; +module.exports = { buildDate:"2023-02-13T21:50:54+01:00", buildRevision: "17085e5578d2a20a77a6ade058f74e6d5b798ecc" }; From 896a4fe98184dc55fb91e8bd96ad39496be74881 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 13 Feb 2023 23:46:04 +0100 Subject: [PATCH 2/5] show mermaid errors, fixes #3610 --- src/public/app/widgets/mermaid.js | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/public/app/widgets/mermaid.js b/src/public/app/widgets/mermaid.js index ad8e94eb8..35c61f13c 100644 --- a/src/public/app/widgets/mermaid.js +++ b/src/public/app/widgets/mermaid.js @@ -73,36 +73,37 @@ export default class MermaidWidget extends NoteContextAwareWidget { const wheelZoomLoaded = libraryLoader.requireLibrary(libraryLoader.WHEEL_ZOOM); try { - const renderedSvg = await this.renderSvg(); - this.$display.html(renderedSvg); + await this.renderSvg(async renderedSvg => { + this.$display.html(renderedSvg); - await wheelZoomLoaded; + await wheelZoomLoaded; - this.$display.attr("id", `mermaid-render-${idCounter}`); + this.$display.attr("id", `mermaid-render-${idCounter}`); - WZoom.create(`#mermaid-render-${idCounter}`, { - type: 'html', - maxScale: 10, - speed: 20, - zoomOnClick: false + WZoom.create(`#mermaid-render-${idCounter}`, { + type: 'html', + maxScale: 10, + speed: 20, + zoomOnClick: false + }); + + this.$errorContainer.hide(); }); - - this.$errorContainer.hide(); } catch (e) { this.$errorMessage.text(e.message); this.$errorContainer.show(); } } - renderSvg() { - return new Promise(async res => { - idCounter++; + async renderSvg(cb) { + idCounter++; - const noteComplement = await froca.getNoteComplement(this.noteId); - const content = noteComplement.content || ""; + const noteComplement = await froca.getNoteComplement(this.noteId); + const content = noteComplement.content || ""; - mermaid.mermaidAPI.render(`mermaid-graph-${idCounter}`, content, res); - }); + // this can't be promisified since in case of error this both calls callback with error SVG and throws exception + // with error details + mermaid.mermaidAPI.render(`mermaid-graph-${idCounter}`, content, cb); } async entitiesReloadedEvent({loadResults}) { @@ -116,9 +117,9 @@ export default class MermaidWidget extends NoteContextAwareWidget { return; } - const renderedSvg = await this.renderSvg(); - - this.download(`${this.note.title}.svg`, renderedSvg); + await this.renderSvg(renderedSvg => { + this.download(`${this.note.title}.svg`, renderedSvg); + }); } download(filename, text) { From cbabaa6b0ca78ac229d23ca21fa6834899198414 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 15 Feb 2023 14:49:58 +0100 Subject: [PATCH 3/5] move advanced menu slightly below to not overlay the text --- package-lock.json | 4 ++-- src/public/app/widgets/buttons/global_menu.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22de73d4c..511811d61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "trilium", - "version": "0.58.7", + "version": "0.58.8", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.58.7", + "version": "0.58.8", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js index 54ca3019d..8108655b7 100644 --- a/src/public/app/widgets/buttons/global_menu.js +++ b/src/public/app/widgets/buttons/global_menu.js @@ -85,6 +85,7 @@ const TPL = ` font-size: 90%; position: relative; left: 0; + top: 5px; } From c95c5bb4714fe5367886888092a3223340771a32 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 15 Feb 2023 15:08:59 +0100 Subject: [PATCH 4/5] fix lost content data after CKEditor crash, closes #3584 --- .../app/widgets/type_widgets/editable_text.js | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js index 67003dc68..5fa11e571 100644 --- a/src/public/app/widgets/type_widgets/editable_text.js +++ b/src/public/app/widgets/type_widgets/editable_text.js @@ -154,6 +154,19 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { } }); + await this.watchdog.setCreator(async (elementOrData, editorConfig) => { + const editor = await BalloonEditor.create(elementOrData, editorConfig); + + editor.model.document.on('change:data', () => this.spacedUpdate.scheduleUpdate()); + + if (glob.isDev && ENABLE_INSPECTOR) { + await import(/* webpackIgnore: true */'../../../libraries/ckeditor/inspector.js'); + CKEditorInspector.attach(editor); + } + + return editor; + }); + await this.watchdog.create(this.$editor[0], { placeholder: "Type the content of your note here ...", mention: mentionSetup, @@ -168,13 +181,6 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { enablePreview: true // Enable preview view } }); - - this.watchdog.editor.model.document.on('change:data', () => this.spacedUpdate.scheduleUpdate()); - - if (glob.isDev && ENABLE_INSPECTOR) { - await import(/* webpackIgnore: true */'../../../libraries/ckeditor/inspector.js'); - CKEditorInspector.attach(this.watchdog.editor); - } } async doRefresh(note) { From 22cea638632983c9ba36338b3ed8ad8d45f8b4f0 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 15 Feb 2023 15:09:34 +0100 Subject: [PATCH 5/5] unneeded await --- src/public/app/widgets/type_widgets/editable_text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js index 5fa11e571..d2be814dc 100644 --- a/src/public/app/widgets/type_widgets/editable_text.js +++ b/src/public/app/widgets/type_widgets/editable_text.js @@ -154,7 +154,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { } }); - await this.watchdog.setCreator(async (elementOrData, editorConfig) => { + this.watchdog.setCreator(async (elementOrData, editorConfig) => { const editor = await BalloonEditor.create(elementOrData, editorConfig); editor.model.document.on('change:data', () => this.spacedUpdate.scheduleUpdate());