wip

ext/fg/js/frontend.js

@@ -32,30 +32,18 @@ window.yomichan_frontend = new class {
     async prepare() {
         try {
             this.options = await apiOptionsGet();
+
+            window.addEventListener('message', e => this.onFrameMessage(e));
+            window.addEventListener('mousedown', e => this.onMouseDown(e));
+            window.addEventListener('mousemove', e => this.onMouseMove(e));
+            window.addEventListener('mouseover', e => this.onMouseOver(e));
+            window.addEventListener('mouseup', e => this.onMouseUp(e));
+            window.addEventListener('resize', e => this.onResize(e));
+
+            chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => this.onBgMessage(action, params, sender, callback));
         } catch (e) {
             this.onError(e);
         }
-
-        window.addEventListener('message', this.onFrameMessage.bind(this));
-        window.addEventListener('mousedown', this.onMouseDown.bind(this));
-        window.addEventListener('mousemove', this.onMouseMove.bind(this));
-        window.addEventListener('mouseover', this.onMouseOver.bind(this));
-        window.addEventListener('mouseup', this.onMouseUp.bind(this));
-        window.addEventListener('resize', this.onResize.bind(this));
-
-        chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
-    }
-
-    popupTimerSet(callback) {
-        this.popupTimerClear();
-        this.popupTimer = window.setTimeout(callback, this.options.scanning.delay);
-    }
-
-    popupTimerClear() {
-        if (this.popupTimer) {
-            window.clearTimeout(this.popupTimer);
-            this.popupTimer = null;
-        }
     }
 
     onMouseOver(e) {
@@ -132,7 +120,11 @@ window.yomichan_frontend = new class {
         }
     }
 
-    onBgMessage({action, params}, sender, callback) {
+    onResize() {
+        this.onSearchClear();
+    }
+
+    onBgMessage(action, params, sender, callback) {
         const handlers = {
             optionsSet: options => {
                 this.options = options;
@@ -150,11 +142,30 @@ window.yomichan_frontend = new class {
         callback();
     }
 
-    onResize() {
+    onError(error) {
-        this.onSearchClear();
+        if (window.yomichan_orphaned) {
+            if (this.lastTextSource && this.options.scanning.modifier !== 'none') {
+                this.popup.showOrphaned(this.lastTextSource.getRect(), this.options);
+            }
+        } else {
+            window.alert(`Error: ${error}`);
+        }
+    }
+
+    popupTimerSet(callback) {
+        this.popupTimerClear();
+        this.popupTimer = window.setTimeout(callback, this.options.scanning.delay);
+    }
+
+    popupTimerClear() {
+        if (this.popupTimer) {
+            window.clearTimeout(this.popupTimer);
+            this.popupTimer = null;
+        }
     }
 
     async searchAt(point) {
+        try {
             if (this.pendingLookup) {
                 return;
             }
@@ -171,17 +182,16 @@ window.yomichan_frontend = new class {
 
             this.pendingLookup = true;
 
-        try {
             if (!await this.searchTerms(textSource)) {
                 await this.searchKanji(textSource);
             }
         } catch (e) {
             this.onError(e);
-        }
+        } finally {
-
             docImposterDestroy();
             this.pendingLookup = false;
         }
+    }
 
     async searchTerms(textSource) {
         textSource.setEndOffset(this.options.scanning.length);
@@ -245,14 +255,6 @@ window.yomichan_frontend = new class {
 
         this.lastTextSource = null;
     }
+}();
 
-    handleError(error, textSource) {
+window.yomichan_frontend.prepare();
-        if (window.yomichan_orphaned) {
-            if (textSource && this.options.scanning.modifier !== 'none') {
-                this.popup.showOrphaned(textSource.getRect(), this.options);
-            }
-        } else {
-            window.alert(`Error: ${error}`);
-        }
-    }
-};

ext/fg/js/popup.js

@@ -40,8 +40,9 @@ class Popup {
         return this.injected;
     }
 
-    show(elementRect, options) {
+    async show(elementRect, options) {
-        return this.inject().then(() => {
+        await this.inject();
+
         const containerStyle = window.getComputedStyle(this.container);
         const containerHeight = parseInt(containerStyle.height);
         const containerWidth = parseInt(containerStyle.width);
@@ -84,7 +85,6 @@ class Popup {
         this.container.style.width = `${width}px`;
         this.container.style.height = `${height}px`;
         this.container.style.visibility = 'visible';
-        });
     }
 
     hide() {
@@ -95,25 +95,22 @@ class Popup {
         return this.injected && this.container.style.visibility !== 'hidden';
     }
 
-    showTermDefs(elementRect, definitions, options, context) {
+    async termsShow(elementRect, definitions, options, context) {
-        this.show(elementRect, options).then(() => {
+        await this.show(elementRect, options);
-            this.invokeApi('showTermDefs', {definitions, options, context});
+        this.invokeApi('termsShow', {definitions, options, context});
-        });
     }
 
-    showKanjiDefs(elementRect, definitions, options, context) {
+    async kanjiShow(elementRect, definitions, options, context) {
-        this.show(elementRect, options).then(() => {
+        await this.show(elementRect, options);
-            this.invokeApi('showKanjiDefs', {definitions, options, context});
+        this.invokeApi('termsShow', {definitions, options, context});
-        });
-    }
-
-    showOrphaned(elementRect, options) {
-        this.show(elementRect, options).then(() => {
-            this.invokeApi('showOrphaned');
-        });
     }
 
     invokeApi(action, params={}) {
         this.container.contentWindow.postMessage({action, params}, '*');
     }
+
+    async onOrphaned(elementRect, options) {
+        await this.show(elementRect, options);
+        this.invokeApi('orphaned');
+    }
 }