self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-03 23:50:33 +02:00
Code Issues Releases Activity

Don't needlessly reload resources

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-28 21:15:22 +00:00
parent 444c96d5e7
commit 2e8fe88f53
3 changed files with 45 additions and 3 deletions
ElectronClient/app/gui
NoteText.jsx
ReactNativeClient/lib
MdToHtml.jsModelCache.js

5
ReactNativeClient/lib/MdToHtml.js

@ -2,6 +2,7 @@ const MarkdownIt = require('markdown-it');
const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = (new Entities()).encode;
const { Resource } = require('lib/models/resource.js');
const ModelCache = require('lib/ModelCache');
const { shim } = require('lib/shim.js');
const md5 = require('md5');
@ -14,6 +15,7 @@ class MdToHtml {
this.loadedResources_ = {};
this.cachedContent_ = null;
this.cachedContentKey_ = null;
this.modelCache_ = new ModelCache();
// Must include last "/"
this.resourceBaseUrl_ = ('resourceBaseUrl' in options) ? options.resourceBaseUrl : null;
@ -80,10 +82,11 @@ class MdToHtml {
this.loadedResources_[id] = {};
const resource = await Resource.load(id);
//const resource = await this.modelCache_.load(Resource, id);
if (!resource) {
// Can happen for example if an image is attached to a note, but the resource hasn't
// been download from the sync target yet.
// been downloaded from the sync target yet.
console.warn('Cannot load resource: ' + id);
return;
}