From ae4ee9ddee0b791c1039595250db6106e66709fa Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 21:49:28 -0500
Subject: Fix error handling on style injection

---
 ext/fg/js/popup.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'ext/fg')

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index dc538b02..59c46ab8 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -219,15 +219,24 @@ class Popup {
             });
             this._observeFullscreen(true);
             this._onFullscreenChanged();
-            try {
-                Popup._injectStylesheet('yomichan-popup-outer-stylesheet', 'file', '/fg/css/client.css', true);
-                this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
-            } catch (e) {
-                // NOP
-            }
+            this._injectStyles();
         });
     }
 
+    async _injectStyles() {
+        try {
+            await Popup._injectStylesheet('yomichan-popup-outer-stylesheet', 'file', '/fg/css/client.css', true);
+        } catch (e) {
+            // NOP
+        }
+
+        try {
+            await this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
+        } catch (e) {
+            // NOP
+        }
+    }
+
     _observeFullscreen(observe) {
         if (!observe) {
             this._fullscreenEventListeners.removeAllEventListeners();
-- 
cgit v1.2.3