Merge pull request #307 from themoeway/modernize

Modernize codebase

6 files changed, 19 insertions, 27 deletions

diff --git a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js b/ext/js/templates/sandbox/anki-template-renderer-content-manager.js
index c51f01b3..596fa499 100644
--- a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js
+++ b/ext/js/templates/sandbox/anki-template-renderer-content-manager.js
@@ -31,7 +31,7 @@
 /**
  * The content manager which is used when generating content for Anki.
  */
-class AnkiTemplateRendererContentManager {
+export class AnkiTemplateRendererContentManager {
     /**
      * Creates a new instance of the class.
      * @param {TemplateRendererMediaProvider} mediaProvider The media provider for the object.
diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/sandbox/anki-template-renderer.js
index 766c7798..10f69745 100644
--- a/ext/js/templates/sandbox/anki-template-renderer.js
+++ b/ext/js/templates/sandbox/anki-template-renderer.js
@@ -16,24 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * AnkiNoteDataCreator
- * AnkiTemplateRendererContentManager
- * CssStyleApplier
- * DictionaryDataUtil
- * Handlebars
- * JapaneseUtil
- * PronunciationGenerator
- * StructuredContentGenerator
- * TemplateRenderer
- * TemplateRendererMediaProvider
- */
+import {Handlebars} from '../../../lib/handlebars.js';
+import {AnkiNoteDataCreator} from '../../data/sandbox/anki-note-data-creator.js';
+import {PronunciationGenerator} from '../../display/sandbox/pronunciation-generator.js';
+import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js';
+import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js';
+import {DictionaryDataUtil} from '../../language/sandbox/dictionary-data-util.js';
+import {JapaneseUtil} from '../../language/sandbox/japanese-util.js';
+import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js';
+import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js';
+import {TemplateRenderer} from './template-renderer.js';
 
 /**
  * This class contains all Anki-specific template rendering functionality. It is built on
  * the generic TemplateRenderer class and various other Anki-related classes.
  */
-class AnkiTemplateRenderer {
+export class AnkiTemplateRenderer {
     /**
      * Creates a new instance of the class.
      */
diff --git a/ext/js/templates/sandbox/template-renderer-frame-api.js b/ext/js/templates/sandbox/template-renderer-frame-api.js
index d8f2714b..7ce2d909 100644
--- a/ext/js/templates/sandbox/template-renderer-frame-api.js
+++ b/ext/js/templates/sandbox/template-renderer-frame-api.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-class TemplateRendererFrameApi {
+export class TemplateRendererFrameApi {
     constructor(templateRenderer) {
         this._templateRenderer = templateRenderer;
         this._windowMessageHandlers = new Map([
diff --git a/ext/js/templates/sandbox/template-renderer-frame-main.js b/ext/js/templates/sandbox/template-renderer-frame-main.js
index df5b65ca..43b17b1e 100644
--- a/ext/js/templates/sandbox/template-renderer-frame-main.js
+++ b/ext/js/templates/sandbox/template-renderer-frame-main.js
@@ -16,10 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* globals
- * AnkiTemplateRenderer
- * TemplateRendererFrameApi
- */
+import {AnkiTemplateRenderer} from './anki-template-renderer.js';
+import {TemplateRendererFrameApi} from './template-renderer-frame-api.js';
 
 (async () => {
     const ankiTemplateRenderer = new AnkiTemplateRenderer();
diff --git a/ext/js/templates/sandbox/template-renderer-media-provider.js b/ext/js/templates/sandbox/template-renderer-media-provider.js
index f430fa27..9d77dd1f 100644
--- a/ext/js/templates/sandbox/template-renderer-media-provider.js
+++ b/ext/js/templates/sandbox/template-renderer-media-provider.js
@@ -20,7 +20,7 @@
  * Handlebars
  */
 
-class TemplateRendererMediaProvider {
+export class TemplateRendererMediaProvider {
     constructor() {
         this._requirements = null;
     }
diff --git a/ext/js/templates/sandbox/template-renderer.js b/ext/js/templates/sandbox/template-renderer.js
index 7179f366..8d8a2765 100644
--- a/ext/js/templates/sandbox/template-renderer.js
+++ b/ext/js/templates/sandbox/template-renderer.js
@@ -16,12 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * Handlebars
- * handlebarsCompileFnName
- */
+import {Handlebars} from '../../../lib/handlebars.js';
 
-class TemplateRenderer {
+export class TemplateRenderer {
     constructor() {
         this._cache = new Map();
         this._cacheMaxSize = 5;
@@ -31,7 +28,6 @@ class TemplateRenderer {
     }
 
     registerHelpers(helpers) {
-        Handlebars.partials = Handlebars.templates;
         for (const [name, helper] of helpers) {
             this._registerHelper(name, helper);
         }
@@ -84,7 +80,7 @@ class TemplateRenderer {
         let instance = cache.get(template);
         if (typeof instance === 'undefined') {
             this._updateCacheSize(this._cacheMaxSize - 1);
-            instance = Handlebars[handlebarsCompileFnName](template);
+            instance = Handlebars.compileAST(template);
             cache.set(template, instance);
         }