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

fix importing notePosition of directories

Browse Source
This commit is contained in:
zadam 2021-10-08 22:31:35 +02:00
parent 20696aa0ab
commit ba676587df
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.zip
View File

Binary file not shown.

4
src/services/html_sanitizer.js
View File

@ -32,7 +32,9 @@ function sanitize(dirtyHtml) {
'span': [ 'class', 'style' ], 'span': [ 'class', 'style' ],
'label': [ 'class' ], 'label': [ 'class' ],
'input': [ 'class', 'type', 'disabled' ], 'input': [ 'class', 'type', 'disabled' ],
'code': [ 'class' ] 'code': [ 'class' ],
'ul': [ 'class' ],
'table': [ 'class' ],
}, },
allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data', 'evernote'], allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data', 'evernote'],
transformTags, transformTags,

1
src/services/import/zip.js
View File

@ -186,6 +186,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
mime: noteMeta ? noteMeta.mime : 'text/html', mime: noteMeta ? noteMeta.mime : 'text/html',
prefix: noteMeta ? noteMeta.prefix : '', prefix: noteMeta ? noteMeta.prefix : '',
isExpanded: noteMeta ? noteMeta.isExpanded : false, isExpanded: noteMeta ? noteMeta.isExpanded : false,
notePosition: (noteMeta && firstNote) ? noteMeta.notePosition : undefined,
isProtected: importRootNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: importRootNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})); }));