Merge pull request #463 from toasted-nutbread/explicit-entry-point

Explicit entry points

4 files changed, 10 insertions, 9 deletions

diff --git a/ext/fg/float.html b/ext/fg/float.html
index c8ea9b67..07c3c9e6 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -57,6 +57,6 @@
 
         <script src="/fg/js/float.js"></script>
 
-        <script src="/fg/js/popup-nested.js"></script>
+        <script src="/fg/js/float-main.js"></script>
     </body>
 </html>
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/content-script-main.js
index 2df59e20..14285536 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/content-script-main.js
@@ -61,7 +61,7 @@ async function createPopupProxy(depth, id, parentFrameId, url) {
     return popup;
 }
 
-async function main() {
+(async () => {
     await yomichan.prepare();
 
     const data = window.frontendInitializationData || {};
@@ -128,6 +128,4 @@ async function main() {
     window.addEventListener('fullscreenchange', applyOptions, false);
 
     await applyOptions();
-}
-
-main();
+})();
diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/float-main.js
index c140f9c8..f056f707 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/float-main.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Yomichan Authors
+ * Copyright (C) 2020  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
@@ -16,6 +16,7 @@
  */
 
 /* global
+ * DisplayFloat
  * apiOptionsGet
  */
 
@@ -26,7 +27,7 @@ function injectPopupNested() {
         '/fg/js/popup.js',
         '/fg/js/popup-proxy.js',
         '/fg/js/frontend.js',
-        '/fg/js/frontend-initialize.js'
+        '/fg/js/content-script-main.js'
     ];
     for (const src of scriptSrcs) {
         const script = document.createElement('script');
@@ -65,3 +66,7 @@ async function popupNestedInitialize(id, depth, parentFrameId, url) {
 
     await applyOptions();
 }
+
+(async () => {
+    new DisplayFloat();
+})();
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 5c2c50c2..18d15a72 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -189,5 +189,3 @@ class DisplayFloat extends Display {
         }
     }
 }
-
-DisplayFloat.instance = new DisplayFloat();