Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-14 17:25:52 +01:00
Code Issues Packages Projects Releases Activity

detect existing attachment in target note

Browse Source
This commit is contained in:
zadam
2023-05-29 22:37:19 +02:00
parent df17840dbc
commit 235b779dec
22 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/components/note_context.js
View File

@@ -62,7 +62,7 @@ class NoteContext extends Component {
this.notePath = resolvedNotePath;
this.viewScope = opts.viewScope;
({noteId: this.noteId, parentNoteId: this.parentNoteId} = treeService.getNoteIdAndParentIdFromNotePath(resolvedNotePath));
({noteId: this.noteId, parentNoteId: this.parentNoteId} = treeService.getNoteIdAndParentIdFromUrl(resolvedNotePath));
this.saveToRecentNotes(resolvedNotePath);

2
src/public/app/components/root_command_executor.js
View File

@@ -41,7 +41,7 @@ export default class RootCommandExecutor extends Component {
}
async searchInSubtreeCommand({notePath}) {
const noteId = treeService.getNoteIdFromNotePath(notePath);
const noteId = treeService.getNoteIdFromUrl(notePath);
this.searchNotesCommand({ancestorNoteId: noteId});
}

4
src/public/app/components/tab_manager.js
View File

@@ -57,7 +57,7 @@ export default class TabManager extends Component {
// preload all notes at once
await froca.getNotes([
...noteContextsToOpen.flatMap(tab =>
[ treeService.getNoteIdFromNotePath(tab.notePath), tab.hoistedNoteId]
[ treeService.getNoteIdFromUrl(tab.notePath), tab.hoistedNoteId]
),
], true);
@@ -66,7 +66,7 @@ export default class TabManager extends Component {
return !!openTab.active;
}
const noteId = treeService.getNoteIdFromNotePath(openTab.notePath);
const noteId = treeService.getNoteIdFromUrl(openTab.notePath);
if (!(noteId in froca.notes)) {
// note doesn't exist so don't try to open tab for it
return false;