Application refactor (#591)

* Rename Yomitan class to Application, change initialization style

* Rename file

* Update init

* Update config

* Remove dead code

1 files changed, 7 insertions, 6 deletions

diff --git a/ext/js/pages/settings/popup-preview-frame-main.js b/ext/js/pages/settings/popup-preview-frame-main.js
index e3d7d0ec..fd08bf1d 100644
--- a/ext/js/pages/settings/popup-preview-frame-main.js
+++ b/ext/js/pages/settings/popup-preview-frame-main.js
@@ -17,17 +17,18 @@
  */
 
 import {PopupFactory} from '../../app/popup-factory.js';
+import {Application} from '../../application.js';
 import {log} from '../../core/logger.js';
 import {HotkeyHandler} from '../../input/hotkey-handler.js';
-import {yomitan} from '../../yomitan.js';
 import {PopupPreviewFrame} from './popup-preview-frame.js';
 
 /** Entry point. */
 async function main() {
     try {
-        await yomitan.prepare();
+        const application = new Application();
+        await application.prepare();
 
-        const {tabId, frameId} = await yomitan.api.frameInformationGet();
+        const {tabId, frameId} = await application.api.frameInformationGet();
         if (typeof tabId === 'undefined') {
             throw new Error('Failed to get tabId');
         }
@@ -36,12 +37,12 @@ async function main() {
         }
 
         const hotkeyHandler = new HotkeyHandler();
-        hotkeyHandler.prepare();
+        hotkeyHandler.prepare(application.crossFrame);
 
-        const popupFactory = new PopupFactory(frameId);
+        const popupFactory = new PopupFactory(application, frameId);
         popupFactory.prepare();
 
-        const preview = new PopupPreviewFrame(tabId, frameId, popupFactory, hotkeyHandler);
+        const preview = new PopupPreviewFrame(application, tabId, frameId, popupFactory, hotkeyHandler);
         await preview.prepare();
 
         document.documentElement.dataset.loaded = 'true';