Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

import fixes

Browse Source
This commit is contained in:
zadam
2020-07-27 23:40:14 +02:00
parent c92526372c
commit c9cbc2db02
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/import.js
View File

@@ -7,7 +7,7 @@ const zipImportService = require('../../services/import/zip');
const singleImportService = require('../../services/import/single'); const singleImportService = require('../../services/import/single');
const cls = require('../../services/cls'); const cls = require('../../services/cls');
const path = require('path'); const path = require('path');
const noteCacheService = require('../../services/note_cache/note_cache.js'); const noteCacheLoader = require('../../services/note_cache/note_cache_loader.js');
const log = require('../../services/log'); const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js'); const TaskContext = require('../../services/task_context.js');
@@ -77,7 +77,7 @@ async function importToBranch(req) {
// import has deactivated note events so note cache is not updated // import has deactivated note events so note cache is not updated
// instead we force it to reload (can be async) // instead we force it to reload (can be async)
noteCacheService.load(); noteCacheLoader.load();
return note; return note;
} }

3
src/services/html_sanitizer.js
View File

@@ -20,7 +20,8 @@ function sanitize(dirtyHtml) {
'label': [ 'class' ], 'label': [ 'class' ],
'input': [ 'class', 'type', 'disabled' ], 'input': [ 'class', 'type', 'disabled' ],
'code': [ 'class' ] 'code': [ 'class' ]
} },
allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data']
}); });
} }

2
src/services/note_cache/note_cache.js
View File

@@ -22,8 +22,6 @@ class NoteCache {
this.attributeIndex = {}; this.attributeIndex = {};
this.loaded = false; this.loaded = false;
this.loadedResolve = null;
this.loadedPromise = new Promise(res => {this.loadedResolve = res;});
} }
/** @return {Attribute[]} */ /** @return {Attribute[]} */

4
src/services/note_cache/note_cache_loader.js
View File

@@ -154,3 +154,7 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED
eventService.subscribe(eventService.ENTER_PROTECTED_SESSION, () => { eventService.subscribe(eventService.ENTER_PROTECTED_SESSION, () => {
noteCache.decryptProtectedNotes(); noteCache.decryptProtectedNotes();
}); });
module.exports = {
load
};