From b0310e34e2c6f023cc8190310ff63d840157f6cc Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 3 Dec 2019 22:13:02 +0100 Subject: [PATCH 1/2] fix CSS loading from subdomain, #741 --- src/public/javascripts/desktop.js | 2 +- src/public/javascripts/dialogs/options/appearance.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 4af63e07d..4c2333621 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -78,7 +78,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) { }; for (const appCssNoteId of window.appCssNoteIds) { - cssLoader.requireCss(`/api/notes/download/${appCssNoteId}`); + cssLoader.requireCss(`api/notes/download/${appCssNoteId}`); } const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/"; diff --git a/src/public/javascripts/dialogs/options/appearance.js b/src/public/javascripts/dialogs/options/appearance.js index 64fa59a3d..0708877bc 100644 --- a/src/public/javascripts/dialogs/options/appearance.js +++ b/src/public/javascripts/dialogs/options/appearance.js @@ -131,7 +131,7 @@ export default class ApperanceOptions { if (noteId) { // make sure the CSS is loaded // if the CSS has been loaded and then updated then the changes won't take effect though - cssLoader.requireCss(`/api/notes/download/${noteId}`); + cssLoader.requireCss(`api/notes/download/${noteId}`); } this.$body.addClass("theme-" + newTheme); From 21e77c83fc9454197c6f72add35bd74f8ef70160 Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 3 Dec 2019 22:31:20 +0100 Subject: [PATCH 2/2] release 0.37.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 a835e574e..f44a9feb9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.37.7", + "version": "0.37.8", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 7ce6b5544..81f57d29c 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-12-02T23:09:42+01:00", buildRevision: "6ba3e5ab7f866ac93ecbb48883dabf61723cde98" }; +module.exports = { buildDate:"2019-12-03T22:31:20+01:00", buildRevision: "b0310e34e2c6f023cc8190310ff63d840157f6cc" };