From 40c0ff58c76d2a07268f7f8c96ecee0db081058b Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 2 Feb 2022 17:46:14 +0300 Subject: Changing way of handling variables and settings --- src/pages/options/init.js | 11 +++-------- src/pages/options/instagram.js | 4 +++- src/pages/options/maps.js | 4 +++- src/pages/options/medium.js | 4 +++- src/pages/options/reddit.js | 12 +++++++----- src/pages/options/search.html | 1 + src/pages/options/search.js | 6 ++++-- src/pages/options/shared.js | 4 ---- src/pages/options/translate.js | 4 +++- src/pages/options/twitter.js | 6 ++++-- src/pages/options/wikipedia.js | 4 +++- src/pages/options/youtube.js | 13 ++++++------- 12 files changed, 40 insertions(+), 33 deletions(-) (limited to 'src/pages/options') diff --git a/src/pages/options/init.js b/src/pages/options/init.js index f9de76f1..09b41fd8 100644 --- a/src/pages/options/init.js +++ b/src/pages/options/init.js @@ -1,8 +1,3 @@ -browser.storage.sync.get( - [ - "theme" - ], - (result) => { - if (result.theme) document.body.classList.add(result.theme); - } -) \ No newline at end of file +browser.storage.sync.get("theme", (result) => { + if (result.theme) document.body.classList.add(result.theme); +}) \ No newline at end of file diff --git a/src/pages/options/instagram.js b/src/pages/options/instagram.js index 77438742..7be11ff1 100644 --- a/src/pages/options/instagram.js +++ b/src/pages/options/instagram.js @@ -2,7 +2,9 @@ import instagramHelper from "../../assets/javascripts/helpers/instagram.js"; let disableBibliogramElement = document.getElementById("disable-bibliogram"); -disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram(); +instagramHelper.init().then(() => { + disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram(); +}) disableBibliogramElement.addEventListener("change", (event) => instagramHelper.setDisableBibliogram(!event.target.checked) diff --git a/src/pages/options/maps.js b/src/pages/options/maps.js index 310f9285..a8819a50 100644 --- a/src/pages/options/maps.js +++ b/src/pages/options/maps.js @@ -2,7 +2,9 @@ import mapsHelper from "../../assets/javascripts/helpers/google-maps.js"; let disableOsmElement = document.getElementById("disable-osm"); -disableOsmElement.checked = !mapsHelper.getDisableOsm(); +mapsHelper.init().then(() => { + disableOsmElement.checked = !mapsHelper.getDisableOsm(); +}) disableOsmElement.addEventListener("change", (event) => mapsHelper.setDisableOsm(!event.target.checked) diff --git a/src/pages/options/medium.js b/src/pages/options/medium.js index bcd2c2e4..5f41282e 100644 --- a/src/pages/options/medium.js +++ b/src/pages/options/medium.js @@ -2,7 +2,9 @@ import mediumHelper from "../../assets/javascripts/helpers/medium.js"; let disableScribeElement = document.getElementById("disable-scribe"); -disableScribeElement.checked = !mediumHelper.getDisableScribe(); +mediumHelper.init().then(() => { + disableScribeElement.checked = !mediumHelper.getDisableScribe(); +}) disableScribeElement.addEventListener("change", (event) => mediumHelper.setDisableScribe(!event.target.checked) diff --git a/src/pages/options/reddit.js b/src/pages/options/reddit.js index 96b736be..0222c6dd 100644 --- a/src/pages/options/reddit.js +++ b/src/pages/options/reddit.js @@ -1,15 +1,17 @@ -import reddit from "../../assets/javascripts/helpers/reddit.js"; +import redditHelper from "../../assets/javascripts/helpers/reddit.js"; let disableRedditElement = document.getElementById("disable-reddit"); let redditFrontendElement = document.getElementById("reddit-frontend"); -disableRedditElement.checked = !reddit.getDisableReddit(); -redditFrontendElement.value = reddit.getRedditFrontend(); +redditHelper.init().then(() => { + disableRedditElement.checked = !redditHelper.getDisableReddit(); + redditFrontendElement.value = redditHelper.getRedditFrontend(); +}) disableRedditElement.addEventListener("change", - (event) => reddit.setDisableReddit(!event.target.checked) + (event) => redditHelper.setDisableReddit(!event.target.checked) ); redditFrontendElement.addEventListener("change", - (event) => reddit.setRedditFrontend(event.target.options[redditFrontendElement.selectedIndex].value) + (event) => redditHelper.setRedditFrontend(event.target.options[redditFrontendElement.selectedIndex].value) ); \ No newline at end of file diff --git a/src/pages/options/search.html b/src/pages/options/search.html index 77bd4d23..d0510eed 100644 --- a/src/pages/options/search.html +++ b/src/pages/options/search.html @@ -64,6 +64,7 @@ + diff --git a/src/pages/options/search.js b/src/pages/options/search.js index 85e39749..37e095a0 100644 --- a/src/pages/options/search.js +++ b/src/pages/options/search.js @@ -3,8 +3,10 @@ import searchHelper from "../../assets/javascripts/helpers/google-search.js"; let disableSearchElement = document.getElementById("disable-search"); let searchFrontendElement = document.getElementById("search-frontend"); -disableSearchElement.checked = !searchHelper.getDisableSearch(); -searchFrontendElement.value = searchHelper.getSearchFrontend(); +searchHelper.init().then(() => { + disableSearchElement.checked = !searchHelper.getDisableSearch(); + searchFrontendElement.value = searchHelper.getSearchFrontend(); +}); searchFrontendElement.addEventListener("change", (event) => searchHelper.setSearchFrontend(event.target.options[searchFrontendElement.selectedIndex].value) diff --git a/src/pages/options/shared.js b/src/pages/options/shared.js index caa3a407..62da2504 100644 --- a/src/pages/options/shared.js +++ b/src/pages/options/shared.js @@ -17,7 +17,6 @@ function parseURL(urlString) { return ""; } - function autocomplete(input, list) { let currentFocus; input.addEventListener("focus", (e) => { @@ -109,9 +108,6 @@ function autocomplete(input, list) { } - - - export default { autocompletes, parseURL, diff --git a/src/pages/options/translate.js b/src/pages/options/translate.js index 4e254446..c6182fc2 100644 --- a/src/pages/options/translate.js +++ b/src/pages/options/translate.js @@ -2,7 +2,9 @@ import googleTranslateHelper from "../../assets/javascripts/helpers/google-trans let disableSimplyTranslateElement = document.getElementById("disable-simplyTranslate"); -disableSimplyTranslateElement.checked = !googleTranslateHelper.getDisableSimplyTranslate(); +googleTranslateHelper.init().then(() => { + disableSimplyTranslateElement.checked = !googleTranslateHelper.getDisableSimplyTranslate(); +}); disableSimplyTranslateElement.addEventListener("change", (event) => googleTranslateHelper.setDisableSimplyTranslate(!event.target.checked) diff --git a/src/pages/options/twitter.js b/src/pages/options/twitter.js index 60be6cb0..bf4f6b98 100644 --- a/src/pages/options/twitter.js +++ b/src/pages/options/twitter.js @@ -3,8 +3,10 @@ import twitterHelper from "../../assets/javascripts/helpers/twitter.js"; let removeTwitterSWElement = document.getElementById("remove-twitter-sw"); let disableNitterElement = document.getElementById("disable-nitter"); -disableNitterElement.checked = !twitterHelper.getDisableNitter(); -removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem +twitterHelper.init().then(() => { + disableNitterElement.checked = !twitterHelper.getDisableNitter(); + removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem +}); disableNitterElement.addEventListener("change", (event) => twitterHelper.setDisableNitter(!event.target.checked) diff --git a/src/pages/options/wikipedia.js b/src/pages/options/wikipedia.js index b2e7d23c..95ef6406 100644 --- a/src/pages/options/wikipedia.js +++ b/src/pages/options/wikipedia.js @@ -2,7 +2,9 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; let disableWikipediaElement = document.getElementById("disable-wikipedia"); -disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia(); +wikipediaHelper.init().then(() => { + disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia(); +}) disableWikipediaElement.addEventListener("change", (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked) diff --git a/src/pages/options/youtube.js b/src/pages/options/youtube.js index 95e7d2c9..a05f4c14 100644 --- a/src/pages/options/youtube.js +++ b/src/pages/options/youtube.js @@ -19,13 +19,13 @@ youtubeHelper.init().then(() => { invidiousDarkModeElement.checked = youtubeHelper.getInvidiousDarkMode(); persistInvidiousPrefsElement.checked = youtubeHelper.getPersistInvidiousPrefs(); invidiousVolumeElement.value = youtubeHelper.getInvidiousVolume(); - invidiousVolumeValueElement.textContent = youtubeHelper.getInvidiousVolume() ? `${youtubeHelper.getInvidiousVolume()}%` : " - "; - invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle() || ""; - invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles() || ""; + invidiousVolumeValueElement.textContent = `${youtubeHelper.getInvidiousVolume()}%`; + invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle(); + invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles(); useFreeTubeElement.checked = youtubeHelper.getUseFreeTube(); invidiousOnlyEmbeddedVideoElement.checked = youtubeHelper.getInvidiousOnlyEmbeddedVideo(); invidiousAlwaysProxyElement.checked = youtubeHelper.getInvidiousAlwaysProxy(); - invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality() || ""; + invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality(); invidiousAutoplayElement.checked = youtubeHelper.getInvidiousAutoplay(); }); @@ -43,11 +43,10 @@ persistInvidiousPrefsElement.addEventListener("change", ); invidiousVolumeElement.addEventListener("input", - commonHelper.debounce(() => { + () => { youtubeHelper.setInvidiousVolume(invidiousVolumeElement.value); - console.info("youtubeHelper.invidiousVolume:", youtubeHelper.getInvidiousVolume()); invidiousVolumeValueElement.textContent = `${invidiousVolumeElement.value}%`; - }, 1) + } ); invidiousPlayerStyleElement.addEventListener("change", -- cgit 1.4.1