From c9cbc2db028c98b0a5bcf822c045e816e8ec358d Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 27 Jul 2020 23:40:14 +0200
Subject: [PATCH] import fixes

---
 src/routes/api/import.js                     | 4 ++--
 src/services/html_sanitizer.js               | 3 ++-
 src/services/note_cache/note_cache.js        | 2 --
 src/services/note_cache/note_cache_loader.js | 4 ++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/routes/api/import.js b/src/routes/api/import.js
index abd24a864..9b699f446 100644
--- a/src/routes/api/import.js
+++ b/src/routes/api/import.js
@@ -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;
 }
diff --git a/src/services/html_sanitizer.js b/src/services/html_sanitizer.js
index 16468ed54..81f5000df 100644
--- a/src/services/html_sanitizer.js
+++ b/src/services/html_sanitizer.js
@@ -20,7 +20,8 @@ function sanitize(dirtyHtml) {
             'label': [ 'class' ],
             'input': [ 'class', 'type', 'disabled' ],
             'code': [ 'class' ]
-        }
+        },
+        allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'data']
     });
 }
 
diff --git a/src/services/note_cache/note_cache.js b/src/services/note_cache/note_cache.js
index c517563d6..b77d6ec5c 100644
--- a/src/services/note_cache/note_cache.js
+++ b/src/services/note_cache/note_cache.js
@@ -22,8 +22,6 @@ class NoteCache {
         this.attributeIndex = {};
 
         this.loaded = false;
-        this.loadedResolve = null;
-        this.loadedPromise = new Promise(res => {this.loadedResolve = res;});
     }
 
     /** @return {Attribute[]} */
diff --git a/src/services/note_cache/note_cache_loader.js b/src/services/note_cache/note_cache_loader.js
index 10adf6e1f..ad74f374b 100644
--- a/src/services/note_cache/note_cache_loader.js
+++ b/src/services/note_cache/note_cache_loader.js
@@ -154,3 +154,7 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED
 eventService.subscribe(eventService.ENTER_PROTECTED_SESSION, () => {
     noteCache.decryptProtectedNotes();
 });
+
+module.exports = {
+    load
+};