From 8aa060337cea2bb8fce7864d509d07df4688f1c2 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 14 Mar 2022 22:32:08 -0400 Subject: AnkiTemplateRendererContentManager (#2088) * Make function private * Update comments * Refactor the content manager that is provided to StructuredContentGenerator in AnkiTemplateRenderer * Update function to not be async, for API parity --- ext/js/templates/sandbox/anki-template-renderer.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'ext/js/templates/sandbox/anki-template-renderer.js') diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js index 67ea0d81..c75f92d3 100644 --- a/ext/js/templates/sandbox/anki-template-renderer.js +++ b/ext/js/templates/sandbox/anki-template-renderer.js @@ -17,6 +17,7 @@ /* global * AnkiNoteDataCreator + * AnkiTemplateRendererContentManager * CssStyleApplier * DictionaryDataUtil * Handlebars @@ -534,16 +535,10 @@ class AnkiTemplateRenderer { } _createStructuredContentGenerator(data) { - const mediaLoader = { - loadMedia: async (path, dictionary, onLoad, onUnload) => { - const imageUrl = this._mediaProvider.getMedia(data, ['dictionaryMedia', path], {dictionary, format: 'fileName', default: null}); - if (imageUrl !== null) { - onLoad(imageUrl); - this._cleanupCallbacks.push(() => onUnload(true)); - } - } - }; - return new StructuredContentGenerator(mediaLoader, document); + const contentManager = new AnkiTemplateRendererContentManager(this._mediaProvider, data); + const instance = new StructuredContentGenerator(contentManager, document); + this._cleanupCallbacks.push(() => contentManager.unloadAll()); + return instance; } _formatGlossary(context, dictionary, options) { -- cgit v1.2.3