From 25a4dafd73890a8181bd072d0b514ec9668ecfea Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 29 Sep 2019 13:00:32 -0400
Subject: Fix tab focus being changed due to settings changes

---
 ext/fg/js/frontend.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 167e82c0..d5bb00c0 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -128,7 +128,7 @@ class Frontend {
         }
 
         this.popupTimerClear();
-        this.searchClear();
+        this.searchClear(true);
     }
 
     onMouseOut(e) {
@@ -138,7 +138,7 @@ class Frontend {
     onFrameMessage(e) {
         const handlers = {
             popupClose: () => {
-                this.searchClear();
+                this.searchClear(true);
             },
 
             selectionCopy: () => {
@@ -153,7 +153,7 @@ class Frontend {
     }
 
     onResize() {
-        this.searchClear();
+        this.searchClear(true);
     }
 
     onClick(e) {
@@ -265,7 +265,7 @@ class Frontend {
     async updateOptions() {
         this.options = await apiOptionsGet(this.getOptionsContext());
         if (!this.options.enable) {
-            this.searchClear();
+            this.searchClear(false);
         }
     }
 
@@ -320,7 +320,7 @@ class Frontend {
                 textSource.cleanup();
             }
             if (hideResults && this.options.scanning.autoHideResults) {
-                this.searchClear();
+                this.searchClear(true);
             }
 
             this.pendingLookup = false;
@@ -392,8 +392,8 @@ class Frontend {
         return true;
     }
 
-    searchClear() {
-        this.popup.hide();
+    searchClear(changeFocus) {
+        this.popup.hide(changeFocus);
         this.popup.clearAutoPlayTimer();
 
         if (this.options.scanning.selectText && this.textSourceLast) {
-- 
cgit v1.2.3


From 861474d2fcebd9db82b25700c71351b7d6611794 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 1 Oct 2019 19:05:30 -0400
Subject: Fix inconsistent return type

---
 ext/fg/js/frontend.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index d5bb00c0..3292cac4 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -333,7 +333,7 @@ class Frontend {
 
         const searchText = textSource.text();
         if (searchText.length === 0) {
-            return;
+            return false;
         }
 
         const {definitions, length} = await apiTermsFind(searchText, this.getOptionsContext());
@@ -366,7 +366,7 @@ class Frontend {
 
         const searchText = textSource.text();
         if (searchText.length === 0) {
-            return;
+            return false;
         }
 
         const definitions = await apiKanjiFind(searchText, this.getOptionsContext());
-- 
cgit v1.2.3


From 7d15213916355a806ba687803ca94209e29f142c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 2 Oct 2019 20:31:42 -0400
Subject: Use static object for frontend message handlers

---
 ext/fg/js/frontend.js | 64 +++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

(limited to 'ext/fg/js/frontend.js')

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index d5bb00c0..deec1ffd 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -55,7 +55,7 @@ class Frontend {
         try {
             this.options = await apiOptionsGet(this.getOptionsContext());
 
-            window.addEventListener('message', this.onFrameMessage.bind(this));
+            window.addEventListener('message', this.onWindowMessage.bind(this));
             window.addEventListener('mousedown', this.onMouseDown.bind(this));
             window.addEventListener('mousemove', this.onMouseMove.bind(this));
             window.addEventListener('mouseover', this.onMouseOver.bind(this));
@@ -71,7 +71,7 @@ class Frontend {
                 window.addEventListener('contextmenu', this.onContextMenu.bind(this));
             }
 
-            chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
+            chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this));
         } catch (e) {
             this.onError(e);
         }
@@ -135,20 +135,12 @@ class Frontend {
         this.popupTimerClear();
     }
 
-    onFrameMessage(e) {
-        const handlers = {
-            popupClose: () => {
-                this.searchClear(true);
-            },
-
-            selectionCopy: () => {
-                document.execCommand('copy');
-            }
-        };
-
-        const handler = handlers[e.data];
-        if (handler) {
-            handler();
+    onWindowMessage(e) {
+        const action = e.data;
+        const handlers = Frontend.windowMessageHandlers;
+        if (handlers.hasOwnProperty(action)) {
+            const handler = handlers[action];
+            handler(this);
         }
     }
 
@@ -240,20 +232,11 @@ class Frontend {
         this.contextMenuChecking = false;
     }
 
-    onBgMessage({action, params}, sender, callback) {
-        const handlers = {
-            optionsUpdate: () => {
-                this.updateOptions();
-            },
-
-            popupSetVisible: ({visible}) => {
-                this.popup.setVisible(visible);
-            }
-        };
-
-        const handler = handlers[action];
-        if (handler) {
-            handler(params);
+    onRuntimeMessage({action, params}, sender, callback) {
+        const handlers = Frontend.runtimeMessageHandlers;
+        if (handlers.hasOwnProperty(action)) {
+            const handler = handlers[action];
+            handler(this, params);
             callback();
         }
     }
@@ -529,4 +512,25 @@ class Frontend {
     }
 }
 
+Frontend.windowMessageHandlers = {
+    popupClose: (self) => {
+        self.searchClear(true);
+    },
+
+    selectionCopy: () => {
+        document.execCommand('copy');
+    }
+};
+
+Frontend.runtimeMessageHandlers = {
+    optionsUpdate: (self) => {
+        self.updateOptions();
+    },
+
+    popupSetVisible: (self, {visible}) => {
+        self.popup.setVisible(visible);
+    }
+};
+
+
 window.yomichan_frontend = Frontend.create();
-- 
cgit v1.2.3