2 files changed, 63 insertions, 7 deletions
diff --git a/ext/js/display/display.js b/ext/js/display/display.js
index ffadd055..c522fe14 100644
--- a/ext/js/display/display.js
+++ b/ext/js/display/display.js
@@ -1573,13 +1573,13 @@ class Display extends EventDispatcher {
         await dynamicLoader.loadScripts([
             '/js/language/text-scanner.js',
             '/js/comm/frame-client.js',
-            '/fg/js/popup.js',
-            '/fg/js/popup-proxy.js',
-            '/fg/js/popup-window.js',
-            '/fg/js/popup-factory.js',
-            '/fg/js/frame-ancestry-handler.js',
-            '/fg/js/frame-offset-forwarder.js',
-            '/fg/js/frontend.js'
+            '/js/app/popup.js',
+            '/js/app/popup-proxy.js',
+            '/js/app/popup-window.js',
+            '/js/app/popup-factory.js',
+            '/js/comm/frame-ancestry-handler.js',
+            '/js/comm/frame-offset-forwarder.js',
+            '/js/app/frontend.js'
         ]);
 
         const popupFactory = new PopupFactory(this._frameId);
diff --git a/ext/js/display/popup-main.js b/ext/js/display/popup-main.js
new file mode 100644
index 00000000..7c048b62
--- /dev/null
+++ b/ext/js/display/popup-main.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020-2021  Yomichan Authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* global
+ * Display
+ * DisplayProfileSelection
+ * DocumentFocusController
+ * HotkeyHandler
+ * JapaneseUtil
+ * api
+ */
+
+(async () => {
+    try {
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
+
+        api.forwardLogsToBackend();
+        await yomichan.backendReady();
+
+        const {tabId, frameId} = await api.frameInformationGet();
+
+        const japaneseUtil = new JapaneseUtil(null);
+
+        const hotkeyHandler = new HotkeyHandler();
+        hotkeyHandler.prepare();
+
+        const display = new Display(tabId, frameId, 'popup', japaneseUtil, documentFocusController, hotkeyHandler);
+        await display.prepare();
+
+        const displayProfileSelection = new DisplayProfileSelection(display);
+        displayProfileSelection.prepare();
+
+        display.initializeState();
+
+        document.documentElement.dataset.loaded = 'true';
+
+        yomichan.ready();
+    } catch (e) {
+        yomichan.logError(e);
+    }
+})();