mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/stable'
# Conflicts: # package.json # src/routes/api/clipper.js
This commit is contained in:
		| @@ -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'); | ||||
|   | ||||
| @@ -65,10 +65,11 @@ function addClipping(req) { | ||||
| } | ||||
|  | ||||
| function createNote(req) { | ||||
|     const {title, content, pageUrl, images, clipType} = req.body; | ||||
|  | ||||
|     log.info(`Creating clipped note from ${pageUrl}`); | ||||
|     let {title, content, pageUrl, images, clipType} = req.body; | ||||
|  | ||||
|     if (!title || !title.trim()) { | ||||
|         title = "Clipped note from " + pageUrl; | ||||
|     } | ||||
|     const clipperInbox = getClipperInboxNote(); | ||||
|  | ||||
|     const {note} = noteService.createNewNote({ | ||||
|   | ||||
| @@ -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" }; | ||||
|   | ||||
| @@ -193,10 +193,11 @@ | ||||
| </div> | ||||
|  | ||||
| <script type="text/javascript"> | ||||
|     const glob = { | ||||
|     window.glob = { | ||||
|         sourceId: '' | ||||
|     }; | ||||
|     const syncInProgress = <%= syncInProgress ? 'true' : 'false' %>; | ||||
|  | ||||
|     window.syncInProgress = <%= syncInProgress ? 'true' : 'false' %>; | ||||
| </script> | ||||
|  | ||||
| <!-- Required for correct loading of scripts in Electron --> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user