mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	clipper doesn't open new tab if the note is already loaded in existing tab
This commit is contained in:
		| @@ -76,6 +76,22 @@ function getActiveEditor() { | ||||
|     } | ||||
| } | ||||
|  | ||||
| async function activateOrOpenNote(noteId) { | ||||
|     for (const tabContext of tabContexts) { | ||||
|         if (tabContext.note && tabContext.note.noteId === noteId) { | ||||
|             await tabContext.activate(); | ||||
|             return; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // if no tab with this note has been found we'll create new tab | ||||
|  | ||||
|     await loadNoteDetail(noteId, { | ||||
|         newTab: true, | ||||
|         activate: true | ||||
|     }); | ||||
| } | ||||
|  | ||||
| function getTabContexts() { | ||||
|     return tabContexts; | ||||
| } | ||||
| @@ -544,6 +560,7 @@ export default { | ||||
|     getTabContexts, | ||||
|     getActiveTabContext, | ||||
|     getActiveEditor, | ||||
|     activateOrOpenNote, | ||||
|     clearOpenTabsTask, | ||||
|     filterTabs, | ||||
|     openEmptyTab, | ||||
|   | ||||
| @@ -713,10 +713,7 @@ messagingService.subscribeToMessages(message => { | ||||
|        reload(); | ||||
|    } | ||||
|    else if (message.type === 'open-note') { | ||||
|        noteDetailService.loadNoteDetail(message.noteId, { | ||||
|            newTab: true, | ||||
|            activate: true | ||||
|        }); | ||||
|        noteDetailService.activateOrOpenNote(message.noteId); | ||||
|  | ||||
|        if (utils.isElectron()) { | ||||
|            const currentWindow = require("electron").remote.getCurrentWindow(); | ||||
|   | ||||
| @@ -38,7 +38,7 @@ async function addClipping(req) { | ||||
|  | ||||
|     const rewrittenContent = await addImagesToNote(images, clippingNote, content); | ||||
|  | ||||
|     await clippingNote.setContent(await clippingNote.getContent() + rewrittenContent); | ||||
|     await clippingNote.setContent(await clippingNote.getContent() + '<p>' + rewrittenContent + '</p>'); | ||||
|  | ||||
|     return { | ||||
|         noteId: clippingNote.noteId | ||||
|   | ||||
		Reference in New Issue
	
	Block a user