From d3eb640aa23efddcdc0980f0c951a12b3df6e793 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 28 Mar 2020 19:25:19 +0100 Subject: [PATCH 1/3] fix upload image from mobile frontend, closes #931 --- src/public/javascripts/mobile.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/public/javascripts/mobile.js b/src/public/javascripts/mobile.js index ce6262f7d..446426efa 100644 --- a/src/public/javascripts/mobile.js +++ b/src/public/javascripts/mobile.js @@ -9,9 +9,16 @@ 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"; +import server from "./services/server.js"; window.glob.isDesktop = utils.isDesktop; window.glob.isMobile = utils.isMobile; + +// required for CKEditor image upload plugin +window.glob.getActiveNode = treeService.getActiveNode; +window.glob.getHeaders = server.getHeaders; +window.glob.noteChanged = noteDetailService.noteChanged; +window.glob.refreshTree = treeService.reload; 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) => { From b4b22d9353bdc6ad4d3bab7cdb33bd0b844cc36d Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 28 Mar 2020 19:39:14 +0100 Subject: [PATCH 2/3] workaround for overflowing component wrapper in landscape mobile frontend, fixes #933 --- src/public/stylesheets/mobile.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/stylesheets/mobile.css b/src/public/stylesheets/mobile.css index b97088011..1be68a0ad 100644 --- a/src/public/stylesheets/mobile.css +++ b/src/public/stylesheets/mobile.css @@ -115,4 +115,5 @@ span.fancytree-expander { /* large left padding is necessary for ckeditor gutter in detail-only (smartphone) layout */ padding-left: 35px; padding-top: 10px; + min-height: 150px !important; } \ No newline at end of file From 0a0de7312c5d375899aa294100e7db1c572b1797 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 28 Mar 2020 20:58:20 +0100 Subject: [PATCH 3/3] release 0.40.7 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7db44d6f6..0955f3cdb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.40.6", + "version": "0.40.7", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index a18feefb1..eda9b6b0b 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2020-03-15T11:21:43+01:00", buildRevision: "f5e27278ab2a38484019ee2510781099b60ec2b6" }; +module.exports = { buildDate:"2020-03-28T20:58:20+01:00", buildRevision: "b4b22d9353bdc6ad4d3bab7cdb33bd0b844cc36d" };