From ab44fd04ffa1055bd17a3da02017e8de3da88af2 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 15 May 2022 18:44:28 +0300 Subject: Complete on supporting Unify #234 --- src/pages/options/general/general.html | 48 ++++++++++++++-------------------- src/pages/options/general/general.js | 27 ++++++------------- src/pages/options/general/general.pug | 8 ------ 3 files changed, 28 insertions(+), 55 deletions(-) (limited to 'src/pages/options/general') diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index c8a8b3fc..51011816 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -11,9 +11,9 @@
- - - General + + + General
YouTube
YT Music
@@ -24,33 +24,33 @@
Imgur
Wikipedia
- - - - - Medium + + + + + Medium
Peertube
LBRY/Odysee
- - - Search + + + Search
- - - Translate + + + Translate
- - - Maps + + + Maps
- - - Send Files + + + Send Files
@@ -62,14 +62,6 @@ -
-

Apply Theme to sites

- -
-
-

Always use Preferred Instances

- -

Auto Redirect of offline instances

diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js index 2fab94fb..89302d5c 100644 --- a/src/pages/options/general/general.js +++ b/src/pages/options/general/general.js @@ -57,20 +57,10 @@ resetSettingsElement.addEventListener("click", } ); -let alwaysUsePreferredElement = document.getElementById("always-use-preferred") -alwaysUsePreferredElement.addEventListener("change", - event => generalHelper.setAlwaysUsePreferred(event.target.checked) -); - let autoRedirectElement = document.getElementById("auto-redirect") autoRedirectElement.addEventListener("change", event => generalHelper.setAutoRedirect(event.target.checked) ); - -let applyThemeToSitesElement = document.getElementById("apply-theme-to-sites") -applyThemeToSitesElement.addEventListener("change", - event => generalHelper.setApplyThemeToSites(event.target.checked) -); let themeElement = document.getElementById("theme"); themeElement.addEventListener("change", event => { const value = event.target.options[theme.selectedIndex].value; @@ -96,10 +86,8 @@ for (const frontend of generalHelper.allPopupFrontends) ) generalHelper.init().then(() => { - alwaysUsePreferredElement.checked = generalHelper.getAlwaysUsePreferred(); autoRedirectElement.checked = generalHelper.getAutoRedirect(); themeElement.value = generalHelper.getTheme(); - applyThemeToSitesElement.checked = generalHelper.getApplyThemeToSites(); instanceTypeElement.addEventListener("change", event => { instanceType = event.target.options[instanceTypeElement.selectedIndex].value @@ -117,13 +105,14 @@ generalHelper.init().then(() => { function calcExceptionsCustomInstances() { document.getElementById("exceptions-custom-checklist").innerHTML = [...exceptionsCustomInstances.url, ...exceptionsCustomInstances.regex].map( - (x) => `
${x} + (x) => `
+ ${x} +
` ).join('\n'); diff --git a/src/pages/options/general/general.pug b/src/pages/options/general/general.pug index b5b46d5f..13e18be6 100644 --- a/src/pages/options/general/general.pug +++ b/src/pages/options/general/general.pug @@ -14,14 +14,6 @@ body.option(dir="auto") option(value="light" data-localise="__MSG_light__") Light option(value="dark" data-localise="__MSG_dark__") Dark - .some-block.option-block - h4(data-localise="__MSG_applyTheme__") Apply Theme to sites - input#apply-theme-to-sites(type="checkbox") - - .some-block.option-block - h4(data-localise="__MSG_alwaysPref__") Always use Preferred Instances - input#always-use-preferred(type="checkbox") - .some-block.option-block h4(data-localise="__MSG_autoRedirect__") Auto Redirect of offline instances input#auto-redirect(type="checkbox") -- cgit 1.4.1