gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Merge branch 'feature/typescript_backend_5' into feature/typescript_backend_6

Browse Source
This commit is contained in:
Elian Doran 2024-04-10 19:26:30 +03:00
commit 32e34eec90
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/import/zip.ts
View File

@ -239,8 +239,8 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
noteId: noteId,
type: resolveNoteType(noteMeta?.type),
mime: noteMeta ? noteMeta.mime : 'text/html',
prefix: noteMeta ? noteMeta.prefix || "" : '',
isExpanded: noteMeta ? noteMeta.isExpanded : false,
prefix: noteMeta?.prefix || '',
isExpanded: !!noteMeta?.isExpanded,
notePosition: (noteMeta && firstNote) ? noteMeta.notePosition : undefined,
isProtected: importRootNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
});
@ -510,8 +510,8 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
noteId,
type,
mime,
prefix: noteMeta ? noteMeta.prefix || "" : '',
isExpanded: noteMeta ? noteMeta.isExpanded : false,
prefix: noteMeta?.prefix || '',
isExpanded: !!noteMeta?.isExpanded,
// root notePosition should be ignored since it relates to the original document
// now import root should be placed after existing notes into new parent
notePosition: (noteMeta && firstNote) ? noteMeta.notePosition : undefined,

2
src/services/script.ts
View File

@ -102,7 +102,7 @@ function executeScript(script: string, params: ScriptParams, startNoteId: string
return executeBundle(bundle, { startNote, originEntity });
}
function execute(ctx: any, script: string) {
function execute(ctx: ScriptContext, script: string) {
return function () { return eval(`const apiContext = this;\r\n(${script}\r\n)()`); }.call(ctx);
}