From 3219441fdfa142341631786e7ea9b588479c47b2 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 11 Jul 2020 23:05:28 +0200 Subject: [PATCH 1/4] fallback for missing parsed title, closes trilium-web-clipper/issues/16 --- src/routes/api/clipper.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js index 6ad2efea4..f6917f00d 100644 --- a/src/routes/api/clipper.js +++ b/src/routes/api/clipper.js @@ -65,7 +65,11 @@ async function addClipping(req) { } async function createNote(req) { - const {title, content, pageUrl, images, clipType} = req.body; + let {title, content, pageUrl, images, clipType} = req.body; + + if (!title || !title.trim()) { + title = "Clipped note from " + pageUrl; + } log.info(`Creating clipped note from ${pageUrl}`); @@ -155,4 +159,4 @@ module.exports = { addClipping, openNote, handshake -}; \ No newline at end of file +}; From f54f6d09b05ecaa5444ecd907a998a751202af23 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 11 Jul 2020 23:19:24 +0200 Subject: [PATCH 2/4] fix declaring global variables on the setup page, closes #1071 --- src/views/setup.ejs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/setup.ejs b/src/views/setup.ejs index ddbd94cfd..c5c7501ad 100644 --- a/src/views/setup.ejs +++ b/src/views/setup.ejs @@ -193,10 +193,11 @@ From 08edc521e48ea7c6de96c19290134b6552844313 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 11 Jul 2020 23:50:38 +0200 Subject: [PATCH 3/4] fix visibility of hyper-link in repeatedly opened dialog --- src/public/app/dialogs/add_link.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/public/app/dialogs/add_link.js b/src/public/app/dialogs/add_link.js index 43f67df85..9d57d02c8 100644 --- a/src/public/app/dialogs/add_link.js +++ b/src/public/app/dialogs/add_link.js @@ -17,7 +17,6 @@ export async function showDialog(widget) { $addLinkTitleSettings.toggle(!textTypeWidget.hasSelection()); - updateTitleFormGroupVisibility(); $addLinkTitleSettings.find('input[type=radio]').on('change', updateTitleFormGroupVisibility); // with selection hyper link is implied @@ -28,6 +27,8 @@ export async function showDialog(widget) { $addLinkTitleSettings.find("input[value='reference-link']").prop("checked", true); } + updateTitleFormGroupVisibility(); + utils.openDialog($dialog); $autoComplete.val('').trigger('focus'); @@ -89,4 +90,4 @@ $form.on('submit', () => { } return false; -}); \ No newline at end of file +}); From 443f389d73998a7c71f6e7fce9fa781ad5113602 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 11 Jul 2020 23:58:59 +0200 Subject: [PATCH 4/4] release 0.43.2 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5a88411ae..9b3ab9ffc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.43.1", + "version": "0.43.2", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 220fdddbf..aabd22ec9 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2020-06-23T10:11:17+02:00", buildRevision: "89aa4fbc73fc6c357e04e037d6a1191fa4058d80" }; +module.exports = { buildDate:"2020-07-11T23:58:59+02:00", buildRevision: "08edc521e48ea7c6de96c19290134b6552844313" };