Move script load to be earlier

yomidevs · Feb 18, 2024 · 349c690 · 349c690
1 parent 2ff72b1
commit 349c690
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 42 deletions.
diff --git a/ext/action-popup.html b/ext/action-popup.html
@@ -12,6 +12,7 @@
     <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/action-popup.css">
+    <script src="/js/pages/action-popup-main.js" type="module"></script>
 </head>
 <body>
 
@@ -81,8 +82,5 @@ <h3 id="extension-info">Yomitan</h3>
     </a>
 </div>
 
-<!-- Scripts -->
-<script src="/js/pages/action-popup-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/background.html b/ext/background.html
@@ -12,14 +12,12 @@
     <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/background.css">
+    <script src="/js/background/background-main.js" type="module"></script>
 </head>
 <body>
 
 <textarea id="clipboard-paste-target"></textarea>
 
-<!-- Scripts -->
-<script src="/js/background/background-main.js" type="module"></script>
-
 <!--
     Due to a Firefox bug, this next element is purposefully terminated incorrectly.
     This element must appear directly inside the <body> element, and it must not be closed properly.

diff --git a/ext/info.html b/ext/info.html
@@ -13,6 +13,7 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
+    <script src="/js/pages/info-main.js" type="module"></script>
 </head>
 <body>
 
@@ -59,8 +60,5 @@ <h2 id="links">Links</h2>
 <div class="content-right"></div>
 </div></div>
 
-<!-- Scripts -->
-<script src="/js/pages/info-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/issues.html b/ext/issues.html
@@ -13,6 +13,7 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
+    <script src="/js/pages/generic-page-main.js" type="module"></script>
 </head>
 <body>
 
@@ -75,8 +76,5 @@ <h2 id="audio-download-idle-timeout">Audio download was cancelled due to an idle
 <div class="content-right"></div>
 </div></div>
 
-<!-- Scripts -->
-<script src="/js/pages/generic-page-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/legal.html b/ext/legal.html
@@ -14,6 +14,7 @@
    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
    <link rel="stylesheet" type="text/css" href="/css/material.css">
    <link rel="stylesheet" type="text/css" href="/css/settings.css">
+   <script src="/js/pages/generic-page-main.js" type="module"></script>
 </head>
 
 <body>
@@ -90,9 +91,6 @@ <h2>Javascript Dependency Licenses</h2>
       </div>
    </div>
 
-   <!-- Scripts -->
-   <script src="/js/pages/generic-page-main.js" type="module"></script>
-
 </body>
 
 </html>
diff --git a/ext/offscreen.html b/ext/offscreen.html
@@ -12,14 +12,12 @@
     <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/background.css">
+    <script src="/js/background/offscreen-main.js" type="module"></script>
 </head>
 <body>
 
 <textarea id="clipboard-paste-target"></textarea>
 
-<!-- Scripts -->
-<script src="/js/background/offscreen-main.js" type="module"></script>
-
 <!--
     Due to a Firefox bug, this next element is purposefully terminated incorrectly.
     This element must appear directly inside the <body> element, and it must not be closed properly.

diff --git a/ext/permissions.html b/ext/permissions.html
@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
     <link rel="stylesheet" type="text/css" href="/css/permissions.css">
+    <script src="/js/pages/permissions-main.js" type="module"></script>
 </head>
 <body>
 
@@ -237,9 +238,5 @@ <h2 id="permissions"></h2>
     <button type="button" class="popup-menu-item" data-menu-action="remove">Remove</button>
 </div></div></div></template>
 
-
-<!-- Scripts -->
-<script src="/js/pages/permissions-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/popup-preview.html b/ext/popup-preview.html
@@ -13,6 +13,7 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/popup-preview.css">
     <link rel="stylesheet" type="text/css" href="/css/popup-outer.css" id="popup-outer-css">
+    <script src="/js/pages/settings/popup-preview-frame-main.js" type="module"></script>
 </head>
 <body>
 
@@ -34,8 +35,5 @@
     </div></div>
 </div></div>
 
-<!-- Scripts -->
-<script src="/js/pages/settings/popup-preview-frame-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/popup.html b/ext/popup.html
@@ -15,6 +15,7 @@
     <link rel="stylesheet" type="text/css" href="/css/display.css">
     <link rel="stylesheet" type="text/css" href="/css/display-pronunciation.css">
     <link rel="stylesheet" type="text/css" href="/css/structured-content.css">
+    <script src="/js/display/popup-main.js" type="module"></script>
 </head>
 <body>
 
@@ -92,8 +93,5 @@ <h3>Default Profile</h3>
 
 <div id="popup-menus"></div>
 
-<!-- Scripts -->
-<script src="/js/display/popup-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/search.html b/ext/search.html
@@ -16,6 +16,7 @@
     <link rel="stylesheet" type="text/css" href="/css/display-pronunciation.css">
     <link rel="stylesheet" type="text/css" href="/css/structured-content.css">
     <link rel="stylesheet" type="text/css" href="/css/search.css">
+    <script src="/js/display/search-main.js" type="module"></script>
 </head>
 <body>
 
@@ -82,8 +83,5 @@ <h1>Yomitan Search</h1>
 
 <div id="popup-menus"></div>
 
-<!-- Scripts -->
-<script src="/js/display/search-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/settings.html b/ext/settings.html
@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
     <link rel="stylesheet" type="text/css" href="/css/display-pronunciation.css">
+    <script src="/js/pages/settings/settings-main.js" type="module"></script>
 </head>
 <body>
 
@@ -3889,9 +3890,5 @@ <h1>Yomitan Settings</h1>
     </select>
 </div></template>
 
-
-<!-- Scripts -->
-<script src="/js/pages/settings/settings-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/template-renderer.html b/ext/template-renderer.html
@@ -11,11 +11,9 @@
     <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
     <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
+    <script src="/js/templates/sandbox/template-renderer-frame-main.js" type="module"></script>
 </head>
 <body>
 
-<!-- Scripts -->
-<script src="/js/templates/sandbox/template-renderer-frame-main.js" type="module"></script>
-
 </body>
 </html>
diff --git a/ext/welcome.html b/ext/welcome.html
@@ -13,6 +13,7 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/css/material.css">
     <link rel="stylesheet" type="text/css" href="/css/settings.css">
+    <script src="/js/pages/welcome-main.js" type="module"></script>
 </head>
 <body>
 
@@ -458,9 +459,5 @@ <h2>Basic customization</h2>
     <button type="button" class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
-
-<!-- Scripts -->
-<script src="/js/pages/welcome-main.js" type="module"></script>
-
 </body>
 </html>