mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	import fixes
This commit is contained in:
		| @@ -7,7 +7,7 @@ const zipImportService = require('../../services/import/zip'); | ||||
| const singleImportService = require('../../services/import/single'); | ||||
| const cls = require('../../services/cls'); | ||||
| 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 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 | ||||
|     // instead we force it to reload (can be async) | ||||
|  | ||||
|     noteCacheService.load(); | ||||
|     noteCacheLoader.load(); | ||||
|  | ||||
|     return note; | ||||
| } | ||||
|   | ||||
| @@ -20,7 +20,8 @@ function sanitize(dirtyHtml) { | ||||
|             'label': [ 'class' ], | ||||
|             'input': [ 'class', 'type', 'disabled' ], | ||||
|             'code': [ 'class' ] | ||||
|         } | ||||
|         }, | ||||
|         allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data'] | ||||
|     }); | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -22,8 +22,6 @@ class NoteCache { | ||||
|         this.attributeIndex = {}; | ||||
|  | ||||
|         this.loaded = false; | ||||
|         this.loadedResolve = null; | ||||
|         this.loadedPromise = new Promise(res => {this.loadedResolve = res;}); | ||||
|     } | ||||
|  | ||||
|     /** @return {Attribute[]} */ | ||||
|   | ||||
| @@ -154,3 +154,7 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED | ||||
| eventService.subscribe(eventService.ENTER_PROTECTED_SESSION, () => { | ||||
|     noteCache.decryptProtectedNotes(); | ||||
| }); | ||||
|  | ||||
| module.exports = { | ||||
|     load | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user