From 34451ebf7122a2a5d140696215411abfb0dfe188 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 29 Nov 2020 13:09:02 -0500
Subject: JapaneseUtil normalization (#1076)

* Use JapaneseUtil as a class which is manually instantiated

* Use alias function for toKana
---
 ext/bg/js/template-renderer.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'ext/bg/js/template-renderer.js')

diff --git a/ext/bg/js/template-renderer.js b/ext/bg/js/template-renderer.js
index c1995acd..6a76a4e6 100644
--- a/ext/bg/js/template-renderer.js
+++ b/ext/bg/js/template-renderer.js
@@ -17,11 +17,11 @@
 
 /* global
  * Handlebars
- * jp
  */
 
 class TemplateRenderer {
-    constructor() {
+    constructor(japaneseUtil) {
+        this._japaneseUtil = japaneseUtil;
         this._cache = new Map();
         this._cacheMaxSize = 5;
         this._helpersRegistered = false;
@@ -119,7 +119,7 @@ class TemplateRenderer {
 
     _furigana(context, ...args) {
         const {expression, reading} = this._getFuriganaExpressionAndReading(context, ...args);
-        const segs = jp.distributeFurigana(expression, reading);
+        const segs = this._japaneseUtil.distributeFurigana(expression, reading);
 
         let result = '';
         for (const seg of segs) {
@@ -135,7 +135,7 @@ class TemplateRenderer {
 
     _furiganaPlain(context, ...args) {
         const {expression, reading} = this._getFuriganaExpressionAndReading(context, ...args);
-        const segs = jp.distributeFurigana(expression, reading);
+        const segs = this._japaneseUtil.distributeFurigana(expression, reading);
 
         let result = '';
         for (const seg of segs) {
@@ -161,6 +161,7 @@ class TemplateRenderer {
     }
 
     _kanjiLinks(context, options) {
+        const jp = this._japaneseUtil;
         let result = '';
         for (const c of options.fn(context)) {
             if (jp.isCodePointKanji(c.codePointAt(0))) {
@@ -385,10 +386,10 @@ class TemplateRenderer {
     }
 
     _isMoraPitchHigh(context, index, position) {
-        return jp.isMoraPitchHigh(index, position);
+        return this._japaneseUtil.isMoraPitchHigh(index, position);
     }
 
     _getKanaMorae(context, text) {
-        return jp.getKanaMorae(`${text}`);
+        return this._japaneseUtil.getKanaMorae(`${text}`);
     }
 }
-- 
cgit v1.2.3