From 7c578f75827ae0a72b13f04b8342fd8129f702d4 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 19 Apr 2020 14:28:29 -0400
Subject: Create popup-preview-frame-main.js

---
 ext/bg/js/settings/popup-preview-frame-main.js | 27 ++++++++++++++++++++++++++
 ext/bg/js/settings/popup-preview-frame.js      | 11 -----------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 ext/bg/js/settings/popup-preview-frame-main.js

(limited to 'ext/bg/js/settings')

diff --git a/ext/bg/js/settings/popup-preview-frame-main.js b/ext/bg/js/settings/popup-preview-frame-main.js
new file mode 100644
index 00000000..e6e4727f
--- /dev/null
+++ b/ext/bg/js/settings/popup-preview-frame-main.js
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2019-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
+ * 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
+ * SettingsPopupPreview
+ */
+
+async function main() {
+    const instance = new SettingsPopupPreview();
+    await instance.prepare();
+}
+
+main();
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index fba114e2..420a7c5a 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -41,12 +41,6 @@ class SettingsPopupPreview {
         ]);
     }
 
-    static create() {
-        const instance = new SettingsPopupPreview();
-        instance.prepare();
-        return instance;
-    }
-
     async prepare() {
         // Setup events
         window.addEventListener('message', this.onMessage.bind(this), false);
@@ -178,8 +172,3 @@ class SettingsPopupPreview {
         this.setInfoVisible(!this.popupShown);
     }
 }
-
-SettingsPopupPreview.instance = SettingsPopupPreview.create();
-
-
-
-- 
cgit v1.2.3


From d8276a9d5d119edf1747593608d3e135947019f0 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 22 Apr 2020 21:42:20 -0400
Subject: Use IIFE for entry points

---
 ext/bg/js/background-main.js                   | 6 ++----
 ext/bg/js/context-main.js                      | 6 ++----
 ext/bg/js/search-main.js                       | 6 ++----
 ext/bg/js/settings/popup-preview-frame-main.js | 6 ++----
 ext/fg/js/content-script-main.js               | 6 ++----
 ext/fg/js/float-main.js                        | 6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'ext/bg/js/settings')

diff --git a/ext/bg/js/background-main.js b/ext/bg/js/background-main.js
index c000c38d..24117f4e 100644
--- a/ext/bg/js/background-main.js
+++ b/ext/bg/js/background-main.js
@@ -19,9 +19,7 @@
  * Backend
  */
 
-async function main() {
+(async () => {
     window.yomichanBackend = new Backend();
     await window.yomichanBackend.prepare();
-}
-
-main();
+})();
diff --git a/ext/bg/js/context-main.js b/ext/bg/js/context-main.js
index 67bb4e18..e2086a96 100644
--- a/ext/bg/js/context-main.js
+++ b/ext/bg/js/context-main.js
@@ -88,8 +88,6 @@ async function mainInner() {
     });
 }
 
-async function main() {
+(async () => {
     window.addEventListener('DOMContentLoaded', mainInner, false);
-}
-
-main();
+})();
diff --git a/ext/bg/js/search-main.js b/ext/bg/js/search-main.js
index 91c39222..38b6d99a 100644
--- a/ext/bg/js/search-main.js
+++ b/ext/bg/js/search-main.js
@@ -52,7 +52,7 @@ function injectSearchFrontend() {
     }
 }
 
-async function main() {
+(async () => {
     await yomichan.prepare();
 
     const displaySearch = new DisplaySearch();
@@ -78,6 +78,4 @@ async function main() {
     yomichan.on('optionsUpdated', applyOptions);
 
     await applyOptions();
-}
-
-main();
+})();
diff --git a/ext/bg/js/settings/popup-preview-frame-main.js b/ext/bg/js/settings/popup-preview-frame-main.js
index e6e4727f..86c2814c 100644
--- a/ext/bg/js/settings/popup-preview-frame-main.js
+++ b/ext/bg/js/settings/popup-preview-frame-main.js
@@ -19,9 +19,7 @@
  * SettingsPopupPreview
  */
 
-async function main() {
+(async () => {
     const instance = new SettingsPopupPreview();
     await instance.prepare();
-}
-
-main();
+})();
diff --git a/ext/fg/js/content-script-main.js b/ext/fg/js/content-script-main.js
index 974320cc..14285536 100644
--- a/ext/fg/js/content-script-main.js
+++ b/ext/fg/js/content-script-main.js
@@ -61,7 +61,7 @@ async function createPopupProxy(depth, id, parentFrameId, url) {
     return popup;
 }
 
-async function contentScriptMain() {
+(async () => {
     await yomichan.prepare();
 
     const data = window.frontendInitializationData || {};
@@ -128,6 +128,4 @@ async function contentScriptMain() {
     window.addEventListener('fullscreenchange', applyOptions, false);
 
     await applyOptions();
-}
-
-contentScriptMain();
+})();
diff --git a/ext/fg/js/float-main.js b/ext/fg/js/float-main.js
index 072c86e0..f056f707 100644
--- a/ext/fg/js/float-main.js
+++ b/ext/fg/js/float-main.js
@@ -67,8 +67,6 @@ async function popupNestedInitialize(id, depth, parentFrameId, url) {
     await applyOptions();
 }
 
-async function main() {
+(async () => {
     new DisplayFloat();
-}
-
-main();
+})();
-- 
cgit v1.2.3