From 95bfe2d9016ef982cdab17b616134aaf44b9753e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 4 Sep 2020 17:58:43 -0400
Subject: [PATCH] Popup proxy improvements (#764)

* Fix incorrect function invocations

* Ignore setVisibleOverride when it returns null

* Omit redundant async

* Change default return value
---
 ext/fg/js/popup-factory.js |  2 +-
 ext/fg/js/popup-proxy.js   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/fg/js/popup-factory.js b/ext/fg/js/popup-factory.js
index 27bd49cd..72c875f7 100644
--- a/ext/fg/js/popup-factory.js
+++ b/ext/fg/js/popup-factory.js
@@ -122,7 +122,7 @@ class PopupFactory {
             promises.push(promise);
         }
 
-        const results = await Promise.all(promises);
+        const results = (await Promise.all(promises)).filter(({token}) => token !== null);
 
         if (errors.length === 0) {
             const token = generateId(16);
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index efbc72a6..26659672 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -86,12 +86,12 @@ class PopupProxy extends EventDispatcher {
         return this._invokeSafe('isVisible', {id: this._id}, false);
     }
 
-    async setVisibleOverride(value, priority) {
-        return this._invokeSafe('setVisibleOverride', {id: this._id, value, priority});
+    setVisibleOverride(value, priority) {
+        return this._invokeSafe('setVisibleOverride', {id: this._id, value, priority}, null);
     }
 
-    async clearVisibleOverride(token) {
-        return this._invokeSafe('clearVisibleOverride', {id: this._id, token});
+    clearVisibleOverride(token) {
+        return this._invokeSafe('clearVisibleOverride', {id: this._id, token}, false);
     }
 
     async containsPoint(x, y) {
@@ -135,12 +135,12 @@ class PopupProxy extends EventDispatcher {
         return this._invokeSafe('updateTheme', {id: this._id});
     }
 
-    async setCustomOuterCss(css, useWebExtensionApi) {
-        return this._invokeSafe('updateTheme', {id: this._id, css, useWebExtensionApi});
+    setCustomOuterCss(css, useWebExtensionApi) {
+        return this._invokeSafe('setCustomOuterCss', {id: this._id, css, useWebExtensionApi});
     }
 
     setChildrenSupported(value) {
-        return this._invokeSafe('updateTheme', {id: this._id, value});
+        return this._invokeSafe('setChildrenSupported', {id: this._id, value});
     }
 
     getFrameRect() {