diff options
| -rw-r--r-- | ext/info.html | 2 | ||||
| -rw-r--r-- | ext/issues.html | 4 | ||||
| -rw-r--r-- | ext/js/pages/generic-page-main.js | 25 | ||||
| -rw-r--r-- | ext/js/pages/quick-start-guide-main.js | 37 | ||||
| -rw-r--r-- | ext/legal.html | 4 | ||||
| -rw-r--r-- | ext/quick-start-guide.html | 2 |
6 files changed, 26 insertions, 48 deletions
diff --git a/ext/info.html b/ext/info.html index faa46cbc..0b455fd4 100644 --- a/ext/info.html +++ b/ext/info.html @@ -18,7 +18,7 @@ <body hidden> <!-- Main content --> -<div class="content-outer"><div class="content"> +<div class="content-outer"><div class="content scrollbar"> <div class="content-left"></div> <div class="content-center"> diff --git a/ext/issues.html b/ext/issues.html index 3c19aa0e..88332431 100644 --- a/ext/issues.html +++ b/ext/issues.html @@ -15,10 +15,10 @@ <link rel="stylesheet" type="text/css" href="/css/settings.css"> <script src="/js/pages/generic-page-main.js" type="module"></script> </head> -<body> +<body hidden> <!-- Main content --> -<div class="content-outer"><div class="content"> +<div class="content-outer"><div class="content scrollbar"> <div class="content-left"></div> <div class="content-center"> 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; -}); diff --git a/ext/legal.html b/ext/legal.html index effcbc35..1f75b13f 100644 --- a/ext/legal.html +++ b/ext/legal.html @@ -17,11 +17,11 @@ <script src="/js/pages/generic-page-main.js" type="module"></script> </head> -<body> +<body hidden> <!-- Main content --> <div class="content-outer"> - <div class="content"> + <div class="content scrollbar"> <div class="content-left"></div> <div class="content-center"> diff --git a/ext/quick-start-guide.html b/ext/quick-start-guide.html index cf4a5e2d..903a963c 100644 --- a/ext/quick-start-guide.html +++ b/ext/quick-start-guide.html @@ -13,7 +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/quick-start-guide-main.js" type="module"></script> + <script src="/js/pages/generic-page-main.js" type="module"></script> </head> <body hidden> |