From 8f33cb76cbe7c86ad6ee3cd6700c40f82dc7230d Mon Sep 17 00:00:00 2001
From: Kuuuube <61125188+Kuuuube@users.noreply.github.com>
Date: Thu, 20 Jun 2024 13:10:07 -0400
Subject: Fix scrollbars on info, legal, and issues; add theming to legal and
 issues (#1096)

* Add theming support to generic-page-main.js

* Mark scrollbars on info, issues, and legal

* Remove quick-start-guide-main.js in favor of generic-page-main.js

* Default body to hidden on issues and legal
---
 ext/js/pages/generic-page-main.js      | 25 ++++++++++++++++++-----
 ext/js/pages/quick-start-guide-main.js | 37 ----------------------------------
 2 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 ext/js/pages/quick-start-guide-main.js

(limited to 'ext/js/pages')

diff --git a/ext/js/pages/generic-page-main.js b/ext/js/pages/generic-page-main.js
index 3d5356ba..5f82257e 100644
--- a/ext/js/pages/generic-page-main.js
+++ b/ext/js/pages/generic-page-main.js
@@ -16,11 +16,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import {ThemeController} from '../app/theme-controller.js';
+import {Application} from '../application.js';
 import {DocumentFocusController} from '../dom/document-focus-controller.js';
 import {ExtensionContentController} from './common/extension-content-controller.js';
+import {SettingsController} from './settings/settings-controller.js';
+
+await Application.main(true, async (application) => {
+    const settingsController = new SettingsController(application);
+    await settingsController.prepare();
+    /** @type {ThemeController} */
+    const themeController = new ThemeController(document.documentElement);
+    themeController.prepare();
+    const optionsFull = await application.api.optionsGetFull();
+    const {profiles, profileCurrent} = optionsFull;
+    const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null;
+    if (primaryProfile !== null) {
+        themeController.theme = primaryProfile.options.general.popupTheme;
+        themeController.siteOverride = true;
+        themeController.updateTheme();
+    }
+    document.body.hidden = false;
 
-/** Entry point. */
-function main() {
     const documentFocusController = new DocumentFocusController();
     documentFocusController.prepare();
 
@@ -28,6 +45,4 @@ function main() {
     extensionContentController.prepare();
 
     document.documentElement.dataset.loaded = 'true';
-}
-
-main();
+});
diff --git a/ext/js/pages/quick-start-guide-main.js b/ext/js/pages/quick-start-guide-main.js
deleted file mode 100644
index 1ddce2f6..00000000
--- a/ext/js/pages/quick-start-guide-main.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2024  Yomitan 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/>.
- */
-
-import {ThemeController} from '../app/theme-controller.js';
-import {Application} from '../application.js';
-import {SettingsController} from './settings/settings-controller.js';
-
-await Application.main(true, async (application) => {
-    const settingsController = new SettingsController(application);
-    await settingsController.prepare();
-    /** @type {ThemeController} */
-    const themeController = new ThemeController(document.documentElement);
-    themeController.prepare();
-    const optionsFull = await application.api.optionsGetFull();
-    const {profiles, profileCurrent} = optionsFull;
-    const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null;
-    if (primaryProfile !== null) {
-        themeController.theme = primaryProfile.options.general.popupTheme;
-        themeController.siteOverride = true;
-        themeController.updateTheme();
-    }
-    document.body.hidden = false;
-});
-- 
cgit v1.2.3