From 6ee50b3c95c970234f9f0151dc2ab55dea51c741 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 25 Jun 2020 18:32:29 -0400
Subject: Make PopupFactory.prepare non-async (#625)

---
 ext/fg/js/content-script-main.js | 2 +-
 ext/fg/js/float.js               | 2 +-
 ext/fg/js/popup-factory.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ext/fg')

diff --git a/ext/fg/js/content-script-main.js b/ext/fg/js/content-script-main.js
index c4aa1bca..1f3a69e5 100644
--- a/ext/fg/js/content-script-main.js
+++ b/ext/fg/js/content-script-main.js
@@ -32,7 +32,7 @@
         }
 
         const popupFactory = new PopupFactory(frameId);
-        await popupFactory.prepare();
+        popupFactory.prepare();
 
         const frontend = new Frontend(
             frameId,
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 199990e5..d7beb675 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -241,7 +241,7 @@ class DisplayFloat extends Display {
         const {frameId} = await api.frameInformationGet();
 
         const popupFactory = new PopupFactory(frameId);
-        await popupFactory.prepare();
+        popupFactory.prepare();
 
         const frontend = new Frontend(
             frameId,
diff --git a/ext/fg/js/popup-factory.js b/ext/fg/js/popup-factory.js
index 4edda91f..904f18b9 100644
--- a/ext/fg/js/popup-factory.js
+++ b/ext/fg/js/popup-factory.js
@@ -28,7 +28,7 @@ class PopupFactory {
 
     // Public functions
 
-    async prepare() {
+    prepare() {
         api.crossFrame.registerHandlers([
             ['getOrCreatePopup',   {async: false, handler: this._onApiGetOrCreatePopup.bind(this)}],
             ['setOptionsContext',  {async: true,  handler: this._onApiSetOptionsContext.bind(this)}],
-- 
cgit v1.2.3