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

imported internal links crash ckeditor, #1979

Browse Source
This commit is contained in:
zadam 2021-05-25 21:45:59 +02:00
parent 3c7232f427
commit b9639bffce
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

2
src/services/html_sanitizer.js
View File

@ -11,7 +11,7 @@ function sanitize(dirtyHtml) {
'figure', 'span', 'label', 'input' 'figure', 'span', 'label', 'input'
], ],
allowedAttributes: { allowedAttributes: {
'a': [ 'href', 'class' ], 'a': [ 'href', 'class', 'data-note-path' ],
'img': [ 'src' ], 'img': [ 'src' ],
'section': [ 'class', 'data-note-id' ], 'section': [ 'class', 'data-note-id' ],
'figure': [ 'class' ], 'figure': [ 'class' ],

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

@ -307,6 +307,14 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return `href="#root/${targetNoteId}"`; return `href="#root/${targetNoteId}"`;
}); });
content = content.replace(/data-note-path="([^"]*)"/g, (match, notePath) => {
const noteId = notePath.split("/").pop();
const targetNoteId = noteIdMap[noteId];
return `data-note-path="root/${targetNoteId}"`;
});
if (noteMeta) { if (noteMeta) {
const includeNoteLinks = (noteMeta.attributes || []) const includeNoteLinks = (noteMeta.attributes || [])
.filter(attr => attr.type === 'relation' && attr.name === 'includeNoteLink'); .filter(attr => attr.type === 'relation' && attr.name === 'includeNoteLink');