gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	package.json
#	src/routes/api/clipper.js
This commit is contained in:
zadam 2020-07-15 00:11:26 +02:00
commit f028b88cce
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/dialogs/add_link.js
View File

@ -17,7 +17,6 @@ export async function showDialog(widget) {
$addLinkTitleSettings.toggle(!textTypeWidget.hasSelection()); $addLinkTitleSettings.toggle(!textTypeWidget.hasSelection());
updateTitleFormGroupVisibility();
$addLinkTitleSettings.find('input[type=radio]').on('change', updateTitleFormGroupVisibility); $addLinkTitleSettings.find('input[type=radio]').on('change', updateTitleFormGroupVisibility);
// with selection hyper link is implied // with selection hyper link is implied
@ -28,6 +27,8 @@ export async function showDialog(widget) {
$addLinkTitleSettings.find("input[value='reference-link']").prop("checked", true); $addLinkTitleSettings.find("input[value='reference-link']").prop("checked", true);
} }
updateTitleFormGroupVisibility();
utils.openDialog($dialog); utils.openDialog($dialog);
$autoComplete.val('').trigger('focus'); $autoComplete.val('').trigger('focus');

7
src/routes/api/clipper.js
View File

@ -65,10 +65,11 @@ function addClipping(req) {
} }
function createNote(req) { function createNote(req) {
const {title, content, pageUrl, images, clipType} = req.body; let {title, content, pageUrl, images, clipType} = req.body;
log.info(`Creating clipped note from ${pageUrl}`);
if (!title || !title.trim()) {
title = "Clipped note from " + pageUrl;
}
const clipperInbox = getClipperInboxNote(); const clipperInbox = getClipperInboxNote();
const {note} = noteService.createNewNote({ const {note} = noteService.createNewNote({

2
src/services/build.js
View File

@ -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" };

5
src/views/setup.ejs
View File

@ -193,10 +193,11 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
const glob = { window.glob = {
sourceId: '' sourceId: ''
}; };
const syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
window.syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
</script> </script>
<!-- Required for correct loading of scripts in Electron --> <!-- Required for correct loading of scripts in Electron -->