From acc013a1a8051d34322f0f5f91d7bdecc0a18843 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 28 Jan 2024 07:22:47 -0500
Subject: JapaneseUtil refactor (#555)

* Copy functions from JapaneseUtil

* Remove JapaneseUtil

* Update usages of JapaneseUtil functions
---
 ext/js/media/audio-downloader.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'ext/js/media')

diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js
index 3a3b21d0..b4f63b96 100644
--- a/ext/js/media/audio-downloader.js
+++ b/ext/js/media/audio-downloader.js
@@ -23,14 +23,13 @@ import {JsonSchema} from '../data/json-schema.js';
 import {ArrayBufferUtil} from '../data/sandbox/array-buffer-util.js';
 import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js';
 import {SimpleDOMParser} from '../dom/simple-dom-parser.js';
+import {isStringEntirelyKana} from '../language/japanese.js';
 
 export class AudioDownloader {
     /**
-     * @param {{japaneseUtil: import('../language/sandbox/japanese-util.js').JapaneseUtil, requestBuilder: RequestBuilder}} details
+     * @param {{requestBuilder: RequestBuilder}} details
      */
-    constructor({japaneseUtil, requestBuilder}) {
-        /** @type {import('../language/sandbox/japanese-util.js').JapaneseUtil} */
-        this._japaneseUtil = japaneseUtil;
+    constructor({requestBuilder}) {
         /** @type {RequestBuilder} */
         this._requestBuilder = requestBuilder;
         /** @type {?JsonSchema} */
@@ -111,7 +110,7 @@ export class AudioDownloader {
 
     /** @type {import('audio-downloader').GetInfoHandler} */
     async _getInfoJpod101(term, reading) {
-        if (reading === term && this._japaneseUtil.isStringEntirelyKana(term)) {
+        if (reading === term && isStringEntirelyKana(term)) {
             reading = term;
             term = '';
         }
-- 
cgit v1.2.3