From efe8140f103179f50b610f182148b9427af99010 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 14 Feb 2021 15:19:31 -0500
Subject: Api prepare refactor (#1391)

* Refactor API preparation

* Run yomichan.prepare manually in the entry point function
---
 ext/js/settings/main.js                       | 4 ++--
 ext/js/settings/pitch-accents-preview-main.js | 4 ++++
 ext/js/settings/popup-preview-frame-main.js   | 3 ++-
 ext/js/settings/settings-main.js              | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'ext/js/settings')

diff --git a/ext/js/settings/main.js b/ext/js/settings/main.js
index 9786d196..0707ea3c 100644
--- a/ext/js/settings/main.js
+++ b/ext/js/settings/main.js
@@ -51,8 +51,8 @@ async function setupEnvironmentInfo() {
 
 (async () => {
     try {
-        api.forwardLogsToBackend();
-        await yomichan.backendReady();
+        api.prepare();
+        await yomichan.prepare();
 
         setupEnvironmentInfo();
         showExtensionInformation();
diff --git a/ext/js/settings/pitch-accents-preview-main.js b/ext/js/settings/pitch-accents-preview-main.js
index f292170a..7bc995a2 100644
--- a/ext/js/settings/pitch-accents-preview-main.js
+++ b/ext/js/settings/pitch-accents-preview-main.js
@@ -17,10 +17,14 @@
 
 /* global
  * DisplayGenerator
+ * api
  */
 
 (async () => {
     try {
+        api.prepare();
+        await yomichan.prepare();
+
         const displayGenerator = new DisplayGenerator({
             japaneseUtil: null,
             mediaLoader: null
diff --git a/ext/js/settings/popup-preview-frame-main.js b/ext/js/settings/popup-preview-frame-main.js
index dcbc0d96..f61b26dc 100644
--- a/ext/js/settings/popup-preview-frame-main.js
+++ b/ext/js/settings/popup-preview-frame-main.js
@@ -24,7 +24,8 @@
 
 (async () => {
     try {
-        api.forwardLogsToBackend();
+        api.prepare();
+        await yomichan.prepare();
 
         const {tabId, frameId} = await api.frameInformationGet();
 
diff --git a/ext/js/settings/settings-main.js b/ext/js/settings/settings-main.js
index 24248110..a7e6b7b0 100644
--- a/ext/js/settings/settings-main.js
+++ b/ext/js/settings/settings-main.js
@@ -66,7 +66,7 @@ async function setupGenericSettingsController(genericSettingController) {
         const statusFooter = new StatusFooter(document.querySelector('.status-footer-container'));
         statusFooter.prepare();
 
-        api.forwardLogsToBackend();
+        api.prepare();
         await yomichan.prepare();
 
         setupEnvironmentInfo();
-- 
cgit v1.2.3