use getTemporaryListenerResult in other places

1 files changed, 8 insertions, 7 deletions

diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index 616f48b8..ca37a26a 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -278,11 +278,16 @@ const yomichan = (() => {
         constructor() {
             super();
 
-            this._isBackendPreparedResolve = null;
-            this._isBackendPreparedPromise = new Promise((resolve) => (this._isBackendPreparedResolve = resolve));
+            this._isBackendPreparedPromise = this.getTemporaryListenerResult(
+                chrome.runtime.onMessage,
+                ({action}, {resolve}) => {
+                    if (action === 'backendPrepared') {
+                        resolve();
+                    }
+                }
+            );
 
             this._messageHandlers = new Map([
-                ['backendPrepared', this._onBackendPrepared.bind(this)],
                 ['getUrl', this._onMessageGetUrl.bind(this)],
                 ['optionsUpdated', this._onMessageOptionsUpdated.bind(this)],
                 ['zoomChanged', this._onMessageZoomChanged.bind(this)]
@@ -362,10 +367,6 @@ const yomichan = (() => {
             return false;
         }
 
-        _onBackendPrepared() {
-            this._isBackendPreparedResolve();
-        }
-
         _onMessageGetUrl() {
             return {url: window.location.href};
         }