From a28cccfde07e76d1e70d2acfe1c2222d8b8ae705 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 4 May 2022 13:59:37 +0300 Subject: Simplified code. Removed pixivMoe, old.reddit.com #239 --- src/pages/background/background.js | 65 +++--- src/pages/background/incognito.js | 2 - src/pages/options/general/general.html | 5 - src/pages/options/imgur/imgur.html | 1 - src/pages/options/imgur/imgur.js | 2 +- src/pages/options/instagram/instagram.html | 1 - src/pages/options/lbry/lbry.html | 1 - src/pages/options/lbry/lbry.js | 68 ++---- src/pages/options/maps/maps.html | 1 - src/pages/options/maps/maps.js | 24 +-- src/pages/options/medium/medium.html | 1 - src/pages/options/medium/medium.js | 79 +++---- src/pages/options/peertube/peertube.html | 1 - src/pages/options/peertube/peertube.js | 64 ++---- src/pages/options/pixiv/pixiv.html | 135 ------------ src/pages/options/pixiv/pixiv.js | 93 -------- src/pages/options/reddit/reddit.html | 2 - src/pages/options/reddit/reddit.js | 110 +++++----- src/pages/options/search/search.html | 1 - src/pages/options/search/search.js | 258 ++++++----------------- src/pages/options/sendTargets/sendTargets.html | 1 - src/pages/options/sendTargets/sendTargets.js | 76 ++----- src/pages/options/speedtest/speedtest.html | 1 - src/pages/options/speedtest/speedtest.js | 76 ++----- src/pages/options/spotify/spotify.html | 29 --- src/pages/options/spotify/spotify.js | 75 +------ src/pages/options/tiktok/tiktok.html | 1 - src/pages/options/tiktok/tiktok.js | 112 ++++------ src/pages/options/translate/translate.html | 1 - src/pages/options/twitter/twitter.html | 1 - src/pages/options/twitter/twitter.js | 116 +++++----- src/pages/options/wikipedia/wikipedia.html | 1 - src/pages/options/wikipedia/wikipedia.js | 89 +++----- src/pages/options/youtube/youtube.html | 3 +- src/pages/options/youtubeMusic/youtubeMusic.html | 1 - src/pages/options/youtubeMusic/youtubeMusic.js | 44 ++-- src/pages/popup/popup.html | 9 - src/pages/popup/popup.js | 5 - 38 files changed, 401 insertions(+), 1154 deletions(-) delete mode 100644 src/pages/options/pixiv/pixiv.html delete mode 100644 src/pages/options/pixiv/pixiv.js (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index ae5f9f95..dffcdc5b 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -11,7 +11,6 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; import speedtestHelper from "../../assets/javascripts/helpers/speedtest.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; @@ -22,25 +21,28 @@ import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js window.browser = window.browser || window.chrome; - - browser.runtime.onInstalled.addListener(async details => { if (details.reason == 'install') { - await instagramHelper.initDefaults(); - await redditHelper.initDefaults(); - await youtubeHelper.initDefaults(); - await tiktokHelper.initDefaults(); - await imgurHelper.initDefaults(); - await wholeInit(); - browser.storage.local.set({ initDefaults: true }) - initListener(); + youtubeHelper.initDefaults(); + youtubeMusicHelper.initDefaults(); + twitterHelper.initDefaults(); + instagramHelper.initDefaults(); + mapsHelper.initDefaults(); + searchHelper.initDefaults(); + translateHelper.initDefaults(); + mediumHelper.initDefaults(); + redditHelper.initDefaults(); + wikipediaHelper.initDefaults(); + imgurHelper.initDefaults(); + tiktokHelper.initDefaults(); + speedtestHelper.initDefaults(); + sendTargetsHelper.initDefaults(); + peertubeHelper.initDefaults(); + lbryHelper.initDefaults(); + spotifyHelper.initDefaults(); } }); -function initListener() { - browser.storage.onChanged.addListener(wholeInit); -} - async function wholeInit() { await youtubeHelper.init(); await youtubeMusicHelper.init(); @@ -54,7 +56,6 @@ async function wholeInit() { await wikipediaHelper.init(); await imgurHelper.init(); await tiktokHelper.init(); - await pixivHelper.init(); await speedtestHelper.init(); await sendTargetsHelper.init(); await peertubeHelper.init(); @@ -63,15 +64,6 @@ async function wholeInit() { await generalHelper.init(); } -await browser.storage.local.get( - 'initDefaults', - async r => { - if (r.initDefaults == true) { - await wholeInit(); - initListener(); - } - }) - let incognitoInit = false; browser.tabs.onCreated.addListener( tab => { @@ -87,7 +79,8 @@ browser.tabs.onCreated.addListener( let BYPASSTABs = []; browser.webRequest.onBeforeRequest.addListener( - details => { + async details => { + await wholeInit(); const url = new URL(details.url); // console.info("url:", url.href, "type:", details.type); let initiator; @@ -115,8 +108,6 @@ browser.webRequest.onBeforeRequest.addListener( if (!newUrl) newUrl = tiktokHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = pixivHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = speedtestHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = sendTargetsHelper.redirect(url, details.type, initiator); @@ -173,20 +164,17 @@ browser.tabs.onRemoved.addListener( } ); - - - - -// Set "blocking" and "responseHeaders". browser.webRequest.onHeadersReceived.addListener( - e => { + async e => { + await wholeInit(); return twitterHelper.removeXFrameOptions(e); }, { urls: [""], }, ["blocking", "responseHeaders"] ); -function redirectOfflineInstance(url, tabId) { +async function redirectOfflineInstance(url, tabId) { + await wholeInit(); let newUrl; newUrl = youtubeHelper.switchInstance(url); @@ -250,7 +238,8 @@ browser.webRequest.onErrorOccurred.addListener( ) browser.tabs.onUpdated.addListener( - (tabId, changeInfo, _) => { + async (tabId, changeInfo, _) => { + await wholeInit(); let url; try { url = new URL(changeInfo.url); } catch (_) { return } @@ -259,11 +248,11 @@ browser.tabs.onUpdated.addListener( if (translateHelper.isTranslateRedirects(url, 'main_frame', 'lingva')) translateHelper.initLingvaLocalStorage(tabId); if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url); // if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId); - } ); -function changeWholeInstance(url) { +async function changeWholeInstance(url) { + await wholeInit(); let newUrl = youtubeHelper.switchInstance(url); if (!newUrl) newUrl = twitterHelper.switchInstance(url); diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js index 689d0422..18096390 100644 --- a/src/pages/background/incognito.js +++ b/src/pages/background/incognito.js @@ -11,7 +11,6 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; import speedtestHelper from "../../assets/javascripts/helpers/speedtest.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; @@ -35,7 +34,6 @@ async function wholeInit() { await wikipediaHelper.init(); await imgurHelper.init(); await tiktokHelper.init(); - await pixivHelper.init(); await speedtestHelper.init(); await sendTargetsHelper.init(); await peertubeHelper.init(); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index e27ff9d4..615ccee3 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -22,7 +22,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
@@ -152,10 +151,6 @@
Reddit
-
-
Pixiv
- -
Spotify
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index a97c1c28..2f959996 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/imgur/imgur.js b/src/pages/options/imgur/imgur.js index 8d4428cf..2830f665 100644 --- a/src/pages/options/imgur/imgur.js +++ b/src/pages/options/imgur/imgur.js @@ -42,7 +42,7 @@ function init() { ], r => { disableImgurElement.checked = !r.disableImgur; - protocol.value = r.imgurProtocol; + protocolElement.value = r.imgurProtocol; changeProtocolSettings(r.imgurProtocol); } ); diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index bc52cd3b..9ff2651c 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index d5d459f7..4b6033aa 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/lbry/lbry.js b/src/pages/options/lbry/lbry.js index 4511373c..3ab04369 100644 --- a/src/pages/options/lbry/lbry.js +++ b/src/pages/options/lbry/lbry.js @@ -2,18 +2,15 @@ import lbryHelper from "../../../assets/javascripts/helpers/lbry.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableLbryElement = document.getElementById("disable-lbry"); -disableLbryElement.addEventListener("change", - (event) => lbryHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - event => { - let protocol = event.target.options[protocolElement.selectedIndex].value - lbryHelper.setProtocol(protocol); - changeProtocolSettings(protocol); - } -); + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableLbryTargets: !lbryHelper.checked, + lbryTargetsProtocol: protocolElement.value, + }); + changeProtocolSettings(protocolElement.value) +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -28,37 +25,20 @@ function changeProtocolSettings(protocol) { } } -lbryHelper.init().then(() => { - disableLbryElement.checked = !lbryHelper.getDisable(); +browser.storage.local.get( + [ + "disableLbryTargets", + "lbryTargetsProtocol" + ], + r => { + disableLbryElement.checked = !r.disableLbryTargets; - let protocol = lbryHelper.getProtocol(); + let protocol = r.lbryTargetsProtocol; protocolElement.value = protocol; changeProtocolSettings(protocol); - browser.storage.local.get("librarianLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'librarian', - 'normal', - lbryHelper, - document, - lbryHelper.getLibrarianNormalRedirectsChecks, - lbryHelper.setLibrarianNormalRedirectsChecks, - lbryHelper.getLibrarianNormalCustomRedirects, - lbryHelper.setLibrarianNormalCustomRedirects, - r.librarianLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'librarian', - 'tor', - lbryHelper, - document, - lbryHelper.getLibrarianTorRedirectsChecks, - lbryHelper.setLibrarianTorRedirectsChecks, - lbryHelper.getLibrarianTorCustomRedirects, - lbryHelper.setLibrarianTorCustomRedirects - ) + commonHelper.processDefaultCustomInstances('librarian', 'normal', lbryHelper, document); + commonHelper.processDefaultCustomInstances('librarian', 'tor', lbryHelper, document) }) @@ -75,17 +55,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.librarian.normal).then(r => { browser.storage.local.set({ librarianLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'librarian', - 'normal', - lbryHelper, - document, - lbryHelper.getLibrarianNormalRedirectsChecks, - lbryHelper.setLibrarianNormalRedirectsChecks, - lbryHelper.getLibrarianNormalCustomRedirects, - lbryHelper.setLibrarianNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('librarian', 'normal', lbryHelper, document); latencyElement.removeEventListener("click", reloadWindow); }); } diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index d4288761..fe18892a 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/maps/maps.js b/src/pages/options/maps/maps.js index 17c628dd..982b7980 100644 --- a/src/pages/options/maps/maps.js +++ b/src/pages/options/maps/maps.js @@ -33,17 +33,7 @@ mapsHelper.init().then(() => { changeFrontendsSettings(frontend); browser.storage.local.get("facilLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'facil', - 'normal', - mapsHelper, - document, - mapsHelper.getFacilNormalRedirectsChecks, - mapsHelper.setFacilNormalRedirectsChecks, - mapsHelper.getFacilNormalCustomRedirects, - mapsHelper.setFacilNormalCustomRedirects, - r.facilLatency, - ) + commonHelper.processDefaultCustomInstances('facil', 'normal', mapsHelper, document, r.facilLatency) }) }) @@ -60,17 +50,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.facil.normal).then(r => { browser.storage.local.set({ facilLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'facil', - 'normal', - mapsHelper, - document, - mapsHelper.getFacilNormalRedirectsChecks, - mapsHelper.setFacilNormalRedirectsChecks, - mapsHelper.getFacilNormalCustomRedirects, - mapsHelper.setFacilNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('facil', 'normal', mapsHelper, document); latencyElement.removeEventListener("click", reloadWindow); }); } diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 303524f7..e7c0a336 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js index d79c1de5..4fb04092 100644 --- a/src/pages/options/medium/medium.js +++ b/src/pages/options/medium/medium.js @@ -2,18 +2,32 @@ import mediumHelper from "../../../assets/javascripts/helpers/medium.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableMediumElement = document.getElementById("disable-medium"); -disableMediumElement.addEventListener("change", - (event) => mediumHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - mediumHelper.setProtocol(protocol); + +browser.storage.local.get( + [ + "disableMedium", + "mediumProtocol" + ], + r => { + disableMediumElement.checked = !r.disableMedium; + + let protocol = r.mediumProtocol; + protocolElement.value = protocol; changeProtocolSettings(protocol); + + commonHelper.processDefaultCustomInstances('scribe', 'normal', mediumHelper, document) + commonHelper.processDefaultCustomInstances('scribe', 'tor', mediumHelper, document) } -); +) + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableMedium: !disableMediumElement.checked, + mediumProtocol: protocolElement.value, + }) + changeProtocolSettings(protocolElement.value); +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -28,41 +42,6 @@ function changeProtocolSettings(protocol) { } } - -mediumHelper.init().then(() => { - disableMediumElement.checked = !mediumHelper.getDisable(); - - let protocol = mediumHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - - browser.storage.local.get("scribeLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'scribe', - 'normal', - mediumHelper, - document, - mediumHelper.getScribeNormalRedirectsChecks, - mediumHelper.setScribeNormalRedirectsChecks, - mediumHelper.getScribeNormalCustomRedirects, - mediumHelper.setScribeNormalCustomRedirects, - r.scribeLatency, - ) - }) - - commonHelper.processDefaultCustomInstances( - 'scribe', - 'tor', - mediumHelper, - document, - mediumHelper.getScribeTorRedirectsChecks, - mediumHelper.setScribeTorRedirectsChecks, - mediumHelper.getScribeTorCustomRedirects, - mediumHelper.setScribeTorCustomRedirects - ) -}) - let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); latencyElement.addEventListener("click", @@ -76,17 +55,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.scribe.normal).then(r => { browser.storage.local.set({ scribeLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'scribe', - 'normal', - mediumHelper, - document, - mediumHelper.getScribeNormalRedirectsChecks, - mediumHelper.setScribeNormalRedirectsChecks, - mediumHelper.getScribeNormalCustomRedirects, - mediumHelper.setScribeNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('scribe', 'normal', mediumHelper, document); latencyElement.removeEventListener("click", reloadWindow); }); } diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index dd034bed..1a4bfa66 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/peertube/peertube.js b/src/pages/options/peertube/peertube.js index 0b7a09e6..419523d0 100644 --- a/src/pages/options/peertube/peertube.js +++ b/src/pages/options/peertube/peertube.js @@ -2,18 +2,31 @@ import peertubeHelper from "../../../assets/javascripts/helpers/peertube.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disablePeertubeElement = document.getElementById("disable-peertube"); -disablePeertubeElement.addEventListener("change", - (event) => peertubeHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - peertubeHelper.setProtocol(protocol); +browser.storage.local.get( + [ + "disablePeertubeTargets", + "peertubeTargetsProtocol" + ], + r => { + disablePeertubeElement.checked = !r.disablePeertubeTargets; + + let protocol = peertubeTargetsProtocol; + protocolElement.value = protocol; changeProtocolSettings(protocol); + + commonHelper.processDefaultCustomInstances('simpleertube', 'normal', peertubeHelper, document); + commonHelper.processDefaultCustomInstances('simpleertube', 'tor', peertubeHelper, document) } -); +) + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disablePeertubeTargets: !disablePeertubeElement.checked, + peertubeTargetsProtocol: protocolElement.value + }) + changeProtocolSettings(protocolElement.value); +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -28,39 +41,6 @@ function changeProtocolSettings(protocol) { } } -peertubeHelper.init().then(() => { - disablePeertubeElement.checked = !peertubeHelper.getDisable(); - - let protocol = peertubeHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("simpleertubeLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'simpleertube', - 'normal', - peertubeHelper, - document, - peertubeHelper.getSimpleertubeNormalRedirectsChecks, - peertubeHelper.setSimpleertubeNormalRedirectsChecks, - peertubeHelper.getSimpleertubeNormalCustomRedirects, - peertubeHelper.setSimpleertubeNormalCustomRedirects - ); - }) - - commonHelper.processDefaultCustomInstances( - 'simpleertube', - 'tor', - peertubeHelper, - document, - peertubeHelper.getSimpleertubeTorRedirectsChecks, - peertubeHelper.setSimpleertubeTorRedirectsChecks, - peertubeHelper.getSimpleertubeTorCustomRedirects, - peertubeHelper.setSimpleertubeTorCustomRedirects - ) -}) - - let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); latencyElement.addEventListener("click", diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html deleted file mode 100644 index 7adbcf2c..00000000 --- a/src/pages/options/pixiv/pixiv.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - General - - - - -
-
- - - General -
-
YouTube
-
YT Music
-
Twitter
-
Instagram
-
TikTok
-
Reddit
-
Imgur
-
Pixiv
-
Speedtest
-
Spotify
-
Wikipedia
-
- - - - - Medium -
-
Peertube
-
LBRY/Odysee
-
- - - Search -
-
- - - Translate -
-
- - - Maps -
-
- - - Send Files -
-
-
-
-

Enable

- -
-
-

- Frontend:This isn't a fully private frontend -

- -
-
-

Protocol

- -
-
-
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
- - -
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
-
-
-
- - - \ No newline at end of file diff --git a/src/pages/options/pixiv/pixiv.js b/src/pages/options/pixiv/pixiv.js deleted file mode 100644 index fe60734b..00000000 --- a/src/pages/options/pixiv/pixiv.js +++ /dev/null @@ -1,93 +0,0 @@ -import pixivHelper from "../../../assets/javascripts/helpers/pixiv.js"; -import commonHelper from "../../../assets/javascripts/helpers/common.js"; - -let disablePixivElement = document.getElementById("disable-pixiv"); -disablePixivElement.addEventListener("change", - (event) => pixivHelper.setDisable(!event.target.checked) -); - -let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - pixivHelper.setProtocol(protocol); - changeProtocolSettings(protocol); - } -); - -function changeProtocolSettings(protocol) { - let normalDiv = document.getElementsByClassName("normal")[0]; - let torDiv = document.getElementsByClassName("tor")[0]; - if (protocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; - } - else if (protocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; - } -} - -pixivHelper.init().then(() => { - disablePixivElement.checked = !pixivHelper.getDisable(); - - let protocol = pixivHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - - browser.storage.local.get("pixivMoeLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'pixivMoe', - 'normal', - pixivHelper, - document, - pixivHelper.getPixivMoeNormalRedirectsChecks, - pixivHelper.setPixivMoeNormalRedirectsChecks, - pixivHelper.getPixivMoeNormalCustomRedirects, - pixivHelper.setPixivMoeNormalCustomRedirects - ); - }) - - commonHelper.processDefaultCustomInstances( - 'pixivMoe', - 'tor', - pixivHelper, - document, - pixivHelper.getPixivMoeTorRedirectsChecks, - pixivHelper.setPixivMoeTorRedirectsChecks, - pixivHelper.getPixivMoeTorCustomRedirects, - pixivHelper.setPixivMoeTorCustomRedirects - ) -}) - - -let latencyElement = document.getElementById("latency"); -let latencyLabel = document.getElementById("latency-label"); -latencyElement.addEventListener("click", - async () => { - let reloadWindow = () => location.reload(); - latencyElement.addEventListener("click", reloadWindow); - await pixivHelper.init(); - let redirects = pixivHelper.getRedirects(); - const oldHtml = latencyLabel.innerHTML; - latencyLabel.innerHTML = '...'; - commonHelper.testLatency(latencyLabel, redirects.pixivMoe.normal).then(r => { - browser.storage.local.set({ pixivMoeLatency: r }); - latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'pixivMoe', - 'normal', - pixivHelper, - document, - pixivHelper.getPixivMoeNormalRedirectsChecks, - pixivHelper.setPixivMoeNormalRedirectsChecks, - pixivHelper.getPixivMoeNormalCustomRedirects, - pixivHelper.setPixivMoeNormalCustomRedirects, - r, - ); - latencyElement.removeEventListener("click", reloadWindow); - }); - - } -); \ No newline at end of file diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 47c0b3b2..9ccc130d 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
@@ -67,7 +66,6 @@
diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js index 47bd1856..3f79eeaa 100644 --- a/src/pages/options/reddit/reddit.js +++ b/src/pages/options/reddit/reddit.js @@ -45,11 +45,6 @@ document.addEventListener("change", async () => { init(); }) -window.onblur = () => { - redditHelper.initLibredditCookies(); - redditHelper.initTedditCookies(); -} - function changeProtocolSettings(protocol) { let normalLibredditDiv = libredditDivElement.getElementsByClassName("normal")[0]; let torLibredditDiv = libredditDivElement.getElementsByClassName("tor")[0]; @@ -91,56 +86,54 @@ function changeFrontendsSettings(frontend) { tedditDivElement.style.display = 'none'; } } -function init() { - browser.storage.local.get( - [ - "disableReddit", - "bypassWatchOnReddit", - "redditProtocol", - "redditFrontend", - - "enableLibredditCustomSettings", - - "redditTheme", - "redditFrontPage", - "redditLayout", - "redditWide", - "redditPostSort", - "redditCommentSort", - "redditShowNsfw", - "redditAutoplayVideos", - "redditUseHls", - "redditHideHlsNotification", - ], - r => { - disableRedditElement.checked = !r.disableReddit - bypassWatchOnRedditElement.checked = r.bypassWatchOnReddit - protocolElement.value = r.redditProtocol - redditFrontendElement.value = r.redditFrontend - enableLibredditSettingsElement.checked = r.enableLibredditCustomSettings - changeFrontendsSettings(r.redditFrontend); - changeProtocolSettings(r.redditProtocol); - - theme.value = r.redditTheme; - front_page.value = r.redditFrontPage; - layout.value = r.redditLayout; - wide.checked = r.redditWide; - post_sort.value = r.redditPostSort; - comment_sort.value = r.redditCommentSort; - show_nsfw.checked = r.redditShowNsfw; - autoplay_videos.checked = r.redditAutoplayVideos; - use_hls.checked = r.redditUseHls; - hide_hls_notification.checked = r.redditHideHlsNotification; - } - ) - - commonHelper.processDefaultCustomInstances('libreddit', 'normal', redditHelper, document) - commonHelper.processDefaultCustomInstances('libreddit', 'tor', redditHelper, document) - - commonHelper.processDefaultCustomInstances('teddit', 'normal', redditHelper, document); - commonHelper.processDefaultCustomInstances('teddit', 'tor', redditHelper, document); -} -init(); + +browser.storage.local.get( + [ + "disableReddit", + "bypassWatchOnReddit", + "redditProtocol", + "redditFrontend", + + "enableLibredditCustomSettings", + + "redditTheme", + "redditFrontPage", + "redditLayout", + "redditWide", + "redditPostSort", + "redditCommentSort", + "redditShowNsfw", + "redditAutoplayVideos", + "redditUseHls", + "redditHideHlsNotification", + ], + r => { + disableRedditElement.checked = !r.disableReddit + bypassWatchOnRedditElement.checked = r.bypassWatchOnReddit + protocolElement.value = r.redditProtocol + redditFrontendElement.value = r.redditFrontend + enableLibredditSettingsElement.checked = r.enableLibredditCustomSettings + changeFrontendsSettings(r.redditFrontend); + changeProtocolSettings(r.redditProtocol); + + theme.value = r.redditTheme; + front_page.value = r.redditFrontPage; + layout.value = r.redditLayout; + wide.checked = r.redditWide; + post_sort.value = r.redditPostSort; + comment_sort.value = r.redditCommentSort; + show_nsfw.checked = r.redditShowNsfw; + autoplay_videos.checked = r.redditAutoplayVideos; + use_hls.checked = r.redditUseHls; + hide_hls_notification.checked = r.redditHideHlsNotification; + } +) + +commonHelper.processDefaultCustomInstances('libreddit', 'normal', redditHelper, document) +commonHelper.processDefaultCustomInstances('libreddit', 'tor', redditHelper, document) +commonHelper.processDefaultCustomInstances('teddit', 'normal', redditHelper, document); +commonHelper.processDefaultCustomInstances('teddit', 'tor', redditHelper, document); + let latencyLibredditElement = document.getElementById("latency-libreddit"); let latencyLibredditLabel = document.getElementById("latency-libreddit-label"); @@ -178,4 +171,9 @@ latencyTedditElement.addEventListener("click", latencyTedditElement.removeEventListener("click", reloadWindow); }); } -); \ No newline at end of file +); + +window.onblur = () => { + redditHelper.initLibredditCookies(); + redditHelper.initTedditCookies(); +} \ No newline at end of file diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index cc1bb006..3c0d9d89 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index 197b17f4..893c3e4f 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -1,66 +1,75 @@ import searchHelper from "../../../assets/javascripts/helpers/search.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; +let searxDiv = document.getElementById("searx"); +let searxngDiv = document.getElementById("searxng") +let whoogleDiv = document.getElementById("whoogle"); + let disableSearchElement = document.getElementById("disable-search"); -disableSearchElement.addEventListener("change", event => searchHelper.setDisable(!event.target.checked)); +let searchFrontendElement = document.getElementById("search-frontend"); +let protocolElement = document.getElementById("protocol") +browser.storage.local.get( + [ + "disableSearch", + "searchFrontend", + "searchProtocol", + ], + r => { + disableSearchElement.checked = !disableSearch; -let searxDivElement = document.getElementById("searx"); -let searxngDivElement = document.getElementById("searxng") -let whoogleDivElement = document.getElementById("whoogle"); + searchFrontendElement.value = r.searchFronten; + changeFrontendsSettings(r.searchFronten); + protocolElement.value = r.searchProtocol; + changeProtocolSettings(r.searchProtocol); + } +); + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableSearch: !disableSearchElement.checked, + searchFrontend: searchFrontendElement.value, + searchProtocol: protocolElement.value, + }); + changeFrontendsSettings(searchFrontendElement.value); + changeProtocolSettings(protocolElement.value); +}) function changeFrontendsSettings(frontend) { let SearxWhoogleElement = document.getElementById("searx-whoogle"); if (frontend == 'searx') { - searxDivElement.style.display = 'block'; - searxngDivElement.style.display = 'none'; - whoogleDivElement.style.display = 'none'; + searxDiv.style.display = 'block'; + searxngDiv.style.display = 'none'; + whoogleDiv.style.display = 'none'; SearxWhoogleElement.style.display = 'block'; } else if (frontend == 'searxng') { - searxDivElement.style.display = 'none'; - searxngDivElement.style.display = 'block'; - whoogleDivElement.style.display = 'none'; + searxDiv.style.display = 'none'; + searxngDiv.style.display = 'block'; + whoogleDiv.style.display = 'none'; SearxWhoogleElement.style.display = 'block'; } else if (frontend == 'whoogle') { - searxDivElement.style.display = 'none'; - searxngDivElement.style.display = 'none'; - whoogleDivElement.style.display = 'block'; + searxDiv.style.display = 'none'; + searxngDiv.style.display = 'none'; + whoogleDiv.style.display = 'block'; SearxWhoogleElement.style.display = 'block'; } } -let searchFrontendElement = document.getElementById("search-frontend"); -searchFrontendElement.addEventListener("change", - event => { - let frontend = event.target.options[searchFrontendElement.selectedIndex].value - searchHelper.setFrontend(frontend) - changeFrontendsSettings(frontend); - } -); - -let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - event => { - let protocol = event.target.options[protocolElement.selectedIndex].value - searchHelper.setProtocol(protocol); - changeProtocolSettings(protocol); - } -); function changeProtocolSettings(protocol) { - let normalsearxDiv = searxDivElement.getElementsByClassName("normal")[0]; - let torsearxDiv = searxDivElement.getElementsByClassName("tor")[0]; - let i2psearxDiv = searxDivElement.getElementsByClassName("i2p")[0]; + let normalsearxDiv = searxDiv.getElementsByClassName("normal")[0]; + let torsearxDiv = searxDiv.getElementsByClassName("tor")[0]; + let i2psearxDiv = searxDiv.getElementsByClassName("i2p")[0]; - let normalsearxngDiv = searxngDivElement.getElementsByClassName("normal")[0]; - let torsearxngDiv = searxngDivElement.getElementsByClassName("tor")[0]; - let i2psearxngDiv = searxngDivElement.getElementsByClassName("i2p")[0]; + let normalsearxngDiv = searxngDiv.getElementsByClassName("normal")[0]; + let torsearxngDiv = searxngDiv.getElementsByClassName("tor")[0]; + let i2psearxngDiv = searxngDiv.getElementsByClassName("i2p")[0]; - let normalwhoogleDiv = whoogleDivElement.getElementsByClassName("normal")[0]; - let torwhoogleDiv = whoogleDivElement.getElementsByClassName("tor")[0]; - let i2pwhoogleDiv = whoogleDivElement.getElementsByClassName("i2p")[0]; + let normalwhoogleDiv = whoogleDiv.getElementsByClassName("normal")[0]; + let torwhoogleDiv = whoogleDiv.getElementsByClassName("tor")[0]; + let i2pwhoogleDiv = whoogleDiv.getElementsByClassName("i2p")[0]; if (protocol == 'normal') { normalsearxDiv.style.display = 'block'; @@ -97,125 +106,15 @@ function changeProtocolSettings(protocol) { } } -searchHelper.init().then(() => { - disableSearchElement.checked = !searchHelper.getDisable(); - let frontend = searchHelper.getFrontend(); - searchFrontendElement.value = frontend; - changeFrontendsSettings(frontend); - - let protocol = searchHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("searxLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'searx', - 'normal', - searchHelper, - document, - searchHelper.getSearxNormalRedirectsChecks, - searchHelper.setSearxNormalRedirectsChecks, - searchHelper.getSearxNormalCustomRedirects, - searchHelper.setSearxNormalCustomRedirects, - r.searxLatency - ); - }) - - commonHelper.processDefaultCustomInstances( - 'searx', - 'tor', - searchHelper, - document, - searchHelper.getSearxTorRedirectsChecks, - searchHelper.setSearxTorRedirectsChecks, - searchHelper.getSearxTorCustomRedirects, - searchHelper.setSearxTorCustomRedirects - ); - - commonHelper.processDefaultCustomInstances( - 'searx', - 'i2p', - searchHelper, - document, - searchHelper.getSearxI2pRedirectsChecks, - searchHelper.setSearxI2pRedirectsChecks, - searchHelper.getSearxI2pCustomRedirects, - searchHelper.setSearxI2pCustomRedirects - ); - - browser.storage.local.get("searxngLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'searxng', - 'normal', - searchHelper, - document, - searchHelper.getSearxngNormalRedirectsChecks, - searchHelper.setSearxngNormalRedirectsChecks, - searchHelper.getSearxngNormalCustomRedirects, - searchHelper.setSearxngNormalCustomRedirects, - r.searxngLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'searxng', - 'tor', - searchHelper, - document, - searchHelper.getSearxngTorRedirectsChecks, - searchHelper.setSearxngTorRedirectsChecks, - searchHelper.getSearxngTorCustomRedirects, - searchHelper.setSearxngTorCustomRedirects - ); - - commonHelper.processDefaultCustomInstances( - 'searxng', - 'i2p', - searchHelper, - document, - searchHelper.getSearxngI2pRedirectsChecks, - searchHelper.setSearxngI2pRedirectsChecks, - searchHelper.getSearxngI2pCustomRedirects, - searchHelper.setSearxngI2pCustomRedirects - ); - - browser.storage.local.get("whoogleLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'whoogle', - 'normal', - searchHelper, - document, - searchHelper.getWhoogleNormalRedirectsChecks, - searchHelper.setWhoogleNormalRedirectsChecks, - searchHelper.getWhoogleNormalCustomRedirects, - searchHelper.setWhoogleNormalCustomRedirects, - r.whoogleLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'whoogle', - 'tor', - searchHelper, - document, - searchHelper.getWhoogleTorRedirectsChecks, - searchHelper.setWhoogleTorRedirectsChecks, - searchHelper.getWhoogleTorCustomRedirects, - searchHelper.setWhoogleTorCustomRedirects - ); - - commonHelper.processDefaultCustomInstances( - 'whoogle', - 'i2p', - searchHelper, - document, - searchHelper.getWhoogleI2pRedirectsChecks, - searchHelper.setWhoogleI2pRedirectsChecks, - searchHelper.getWhoogleI2pCustomRedirects, - searchHelper.setWhoogleI2pCustomRedirects - ); -}); - +commonHelper.processDefaultCustomInstances('searx', 'normal', searchHelper, document); +commonHelper.processDefaultCustomInstances('searx', 'tor', searchHelper, document); +commonHelper.processDefaultCustomInstances('searx', 'i2p', searchHelper, document); +commonHelper.processDefaultCustomInstances('searxng', 'normal', searchHelper, document); +commonHelper.processDefaultCustomInstances('searxng', 'tor', searchHelper, document); +commonHelper.processDefaultCustomInstances('searxng', 'i2p', searchHelper, document); +commonHelper.processDefaultCustomInstances('whoogle', 'normal', searchHelper, document); +commonHelper.processDefaultCustomInstances('whoogle', 'tor', searchHelper, document); +commonHelper.processDefaultCustomInstances('whoogle', 'i2p', searchHelper, document); let latencySearxElement = document.getElementById("latency-searx"); let latencySearxLabel = document.getElementById("latency-searx-label"); @@ -230,17 +129,7 @@ latencySearxElement.addEventListener("click", commonHelper.testLatency(latencySearxLabel, redirects.searx.normal).then(r => { browser.storage.local.set({ searxLatency: r }); latencySearxLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'searx', - 'normal', - searchHelper, - document, - searchHelper.getSearxNormalRedirectsChecks, - searchHelper.setSearxNormalRedirectsChecks, - searchHelper.getSearxNormalCustomRedirects, - searchHelper.setSearxNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('searx', 'normal', searchHelper, document); latencySearxElement.removeEventListener("click", reloadWindow); }); } @@ -259,17 +148,7 @@ latencySearxngElement.addEventListener("click", commonHelper.testLatency(latencySearxngLabel, redirects.searxng.normal).then(r => { browser.storage.local.set({ searxngLatency: r }); latencySearxngLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'searxng', - 'normal', - searchHelper, - document, - searchHelper.getSearxngNormalRedirectsChecks, - searchHelper.setSearxngNormalRedirectsChecks, - searchHelper.getSearxngNormalCustomRedirects, - searchHelper.setSearxngNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('searxng', 'normal', searchHelper, document); latencySearxngElement.removeEventListener("click", reloadWindow); }); } @@ -288,18 +167,13 @@ latencyWhoogleElement.addEventListener("click", commonHelper.testLatency(latencyWhoogleLabel, redirects.whoogle.normal).then(r => { browser.storage.local.set({ whoogleLatency: r }); latencyWhoogleLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'whoogle', - 'normal', - searchHelper, - document, - searchHelper.getWhoogleNormalRedirectsChecks, - searchHelper.setWhoogleNormalRedirectsChecks, - searchHelper.getWhoogleNormalCustomRedirects, - searchHelper.setWhoogleNormalCustomRedirects, - r, - ); + commonHelper.processDefaultCustomInstances('whoogle', 'normal', searchHelper, document); latencyWhoogleElement.removeEventListener("click", reloadWindow); }); } -); \ No newline at end of file +); + +window.onblur = () => { + searchHelper.initSearxCookies(); + searchHelper.initSearxngCookies(); +} \ No newline at end of file diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index c54c1582..b63c8233 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/sendTargets/sendTargets.js b/src/pages/options/sendTargets/sendTargets.js index ae6f9e77..dc40f83f 100644 --- a/src/pages/options/sendTargets/sendTargets.js +++ b/src/pages/options/sendTargets/sendTargets.js @@ -2,18 +2,28 @@ import sendTargetsHelper from "../../../assets/javascripts/helpers/sendTargets.j import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableSendTargetsElement = document.getElementById("disable-sendTargets"); -disableSendTargetsElement.addEventListener("change", - (event) => sendTargetsHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - sendTargetsHelper.setProtocol(protocol); - changeProtocolSettings(protocol); + +browser.storage.local.get( + [ + "disableSendTarget", + "sendTargetsProtocol", + ], + r => { + disableSendTargetsElement.checked = !r.disableSendTarget; + + protocolElement.value = r.sendTargetsProtocol; + changeProtocolSettings(r.sendTargetsProtocol); } -); +) + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableSendTarget: !disableSendTargetsElement.checked, + sendTargetsProtocol: protocolElement.value, + }) + changeProtocolSettings(protocolElement.value); +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -28,38 +38,8 @@ function changeProtocolSettings(protocol) { } } -sendTargetsHelper.init().then(() => { - disableSendTargetsElement.checked = !sendTargetsHelper.getDisable(); - - let protocol = sendTargetsHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("sendLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'send', - 'normal', - sendTargetsHelper, - document, - sendTargetsHelper.getSendNormalRedirectsChecks, - sendTargetsHelper.setSendNormalRedirectsChecks, - sendTargetsHelper.getSendNormalCustomRedirects, - sendTargetsHelper.setSendNormalCustomRedirects, - r.sendLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'send', - 'tor', - sendTargetsHelper, - document, - sendTargetsHelper.getSendTorRedirectsChecks, - sendTargetsHelper.setSendTorRedirectsChecks, - sendTargetsHelper.getSendTorCustomRedirects, - sendTargetsHelper.setSendTorCustomRedirects - ) -}) +commonHelper.processDefaultCustomInstances('send', 'normal', sendTargetsHelper, document); +commonHelper.processDefaultCustomInstances('send', 'tor', sendTargetsHelper, document,) let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -74,17 +54,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.send.normal).then(r => { browser.storage.local.set({ sendLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'send', - 'normal', - sendTargetsHelper, - document, - sendTargetsHelper.getSendNormalRedirectsChecks, - sendTargetsHelper.setSendNormalRedirectsChecks, - sendTargetsHelper.getSendNormalCustomRedirects, - sendTargetsHelper.setSendNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('send', 'normal', sendTargetsHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/speedtest/speedtest.html b/src/pages/options/speedtest/speedtest.html index 5ac5cdaa..369d226a 100644 --- a/src/pages/options/speedtest/speedtest.html +++ b/src/pages/options/speedtest/speedtest.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/speedtest/speedtest.js b/src/pages/options/speedtest/speedtest.js index 077d6440..95fa9fea 100644 --- a/src/pages/options/speedtest/speedtest.js +++ b/src/pages/options/speedtest/speedtest.js @@ -2,18 +2,28 @@ import speedtestHelper from "../../../assets/javascripts/helpers/speedtest.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableSpeedtestElement = document.getElementById("disable-speedtest"); -disableSpeedtestElement.addEventListener("change", - (event) => speedtestHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - speedtestHelper.setProtocol(protocol); - changeProtocolSettings(protocol); + +browser.storage.local.get( + [ + "disableSpeedtest", + "speedtestProtocol", + ], + r => { + disableSpeedtestElement.checked = !r.disableSpeedtest; + + protocolElement.value = r.speedtestProtocol; + changeProtocolSettings(r.speedtestProtocol); } -); +) + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableSpeedtest: !disableSpeedtestElement.checked, + speedtestProtocol: protocolElement.value, + }) + changeProtocolSettings(protocolElement.value); +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -28,38 +38,8 @@ function changeProtocolSettings(protocol) { } } -speedtestHelper.init().then(() => { - disableSpeedtestElement.checked = !speedtestHelper.getDisable(); - - let protocol = speedtestHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("librespeedLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'librespeed', - 'normal', - speedtestHelper, - document, - speedtestHelper.getLibrespeedNormalRedirectsChecks, - speedtestHelper.setLibrespeedNormalRedirectsChecks, - speedtestHelper.getLibrespeedNormalCustomRedirects, - speedtestHelper.setLibrespeedNormalCustomRedirects, - r.librespeedLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'librespeed', - 'tor', - speedtestHelper, - document, - speedtestHelper.getLibrespeedTorRedirectsChecks, - speedtestHelper.setLibrespeedTorRedirectsChecks, - speedtestHelper.getLibrespeedTorCustomRedirects, - speedtestHelper.setLibrespeedTorCustomRedirects - ) -}) +commonHelper.processDefaultCustomInstances('librespeed', 'normal', speedtestHelper, document); +commonHelper.processDefaultCustomInstances('librespeed', 'tor', speedtestHelper, document); let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -74,17 +54,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.librespeed.normal).then(r => { browser.storage.local.set({ librespeedLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'librespeed', - 'normal', - speedtestHelper, - document, - speedtestHelper.getLibrespeedNormalRedirectsChecks, - speedtestHelper.setLibrespeedNormalRedirectsChecks, - speedtestHelper.getLibrespeedNormalCustomRedirects, - speedtestHelper.setLibrespeedNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('librespeed', 'normal', speedtestHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html index 0496875a..03a1ca9e 100644 --- a/src/pages/options/spotify/spotify.html +++ b/src/pages/options/spotify/spotify.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
@@ -62,13 +61,6 @@

Enable

-
-

Protocol

- -
@@ -99,27 +91,6 @@
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
-
diff --git a/src/pages/options/spotify/spotify.js b/src/pages/options/spotify/spotify.js index d158412d..33cc9e91 100644 --- a/src/pages/options/spotify/spotify.js +++ b/src/pages/options/spotify/spotify.js @@ -2,64 +2,17 @@ import spotifyHelper from "../../../assets/javascripts/helpers/spotify.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableSpotifyElement = document.getElementById("disable-spotify"); -disableSpotifyElement.addEventListener("change", - (event) => spotifyHelper.setDisable(!event.target.checked) -); -let protocolElement = document.getElementById("protocol") -protocolElement.addEventListener("change", - (event) => { - let protocol = event.target.options[protocolElement.selectedIndex].value - spotifyHelper.setProtocol(protocol); - changeProtocolSettings(protocol); +browser.storage.local.get( + [ + "disableSpotifyTargets", + ], + r => { + disableSpotifyElement.checked = !r.disableSpotifyTargets; } -); +) -function changeProtocolSettings(protocol) { - let normalDiv = document.getElementsByClassName("normal")[0]; - let torDiv = document.getElementsByClassName("tor")[0]; - if (protocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; - } - else if (protocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; - } -} - -spotifyHelper.init().then(() => { - disableSpotifyElement.checked = !spotifyHelper.getDisable(); - - let protocol = spotifyHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("sojuLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'soju', - 'normal', - spotifyHelper, - document, - spotifyHelper.getSojuNormalRedirectsChecks, - spotifyHelper.setSojuNormalRedirectsChecks, - spotifyHelper.getSojuNormalCustomRedirects, - spotifyHelper.setSojuNormalCustomRedirects, - r.sojuLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'soju', - 'tor', - spotifyHelper, - document, - spotifyHelper.getSojuTorRedirectsChecks, - spotifyHelper.setSojuTorRedirectsChecks, - spotifyHelper.getSojuTorCustomRedirects, - spotifyHelper.setSojuTorCustomRedirects - ) -}) +commonHelper.processDefaultCustomInstances('soju', 'normal', spotifyHelper, document); let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -74,17 +27,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.soju.normal).then(r => { browser.storage.local.set({ sojuLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'soju', - 'normal', - spotifyHelper, - document, - spotifyHelper.getSojuNormalRedirectsChecks, - spotifyHelper.setSojuNormalRedirectsChecks, - spotifyHelper.getSojuNormalCustomRedirects, - spotifyHelper.setSojuNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('soju', 'normal', spotifyHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 9aff1e47..e422eef7 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js index 299664db..61841145 100644 --- a/src/pages/options/tiktok/tiktok.js +++ b/src/pages/options/tiktok/tiktok.js @@ -26,68 +26,44 @@ document.addEventListener("change", async () => { window.onblur = tiktokHelper.initProxiTokCookies; -function init() { - tiktokHelper.init().then(() => { - browser.storage.local.get( - [ - "disableTiktok", - "tiktokProtocol", - - "enableTiktokCustomSettings", - - "proxiTokTheme", - "proxiTokApiLegacy", - ], - r => { - disable.checked = !r.disableTiktok; - protocol.value = r.tiktokProtocol; - let normalDiv = document.getElementsByClassName("normal")[0]; - let torDiv = document.getElementsByClassName("tor")[0]; - if (r.tiktokProtocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; - } - else if (r.tiktokProtocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; - } - - enableCustomSettings.checked = r.enableTiktokCustomSettings; - if (r.enableTiktokCustomSettings) - customSettingsDiv.style.display = 'block'; - else - customSettingsDiv.style.display = 'none'; - - theme.value = r.proxiTokTheme; - api_legacy.value = r.proxiTokApiLegacy - } - ) - browser.storage.local.get("proxiTokLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'normal', - tiktokHelper, - document, - tiktokHelper.getProxiTokNormalRedirectsChecks, - tiktokHelper.setProxiTokNormalRedirectsChecks, - tiktokHelper.getProxiTokNormalCustomRedirects, - tiktokHelper.setProxiTokNormalCustomRedirects, - r.proxiTokLatency, - ); - }) - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'tor', - tiktokHelper, - document, - tiktokHelper.getProxiTokTorRedirectsChecks, - tiktokHelper.setProxiTokTorRedirectsChecks, - tiktokHelper.getProxiTokTorCustomRedirects, - tiktokHelper.setProxiTokTorCustomRedirects - ) - }) -} -init(); +browser.storage.local.get( + [ + "disableTiktok", + "tiktokProtocol", + + "enableTiktokCustomSettings", + + "proxiTokTheme", + "proxiTokApiLegacy", + ], + r => { + disable.checked = !r.disableTiktok; + protocol.value = r.tiktokProtocol; + let normalDiv = document.getElementsByClassName("normal")[0]; + let torDiv = document.getElementsByClassName("tor")[0]; + if (r.tiktokProtocol == 'normal') { + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (r.tiktokProtocol == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } + + enableCustomSettings.checked = r.enableTiktokCustomSettings; + if (r.enableTiktokCustomSettings) + customSettingsDiv.style.display = 'block'; + else + customSettingsDiv.style.display = 'none'; + + theme.value = r.proxiTokTheme; + api_legacy.value = r.proxiTokApiLegacy + } +) + +commonHelper.processDefaultCustomInstances('proxiTok', 'normal', tiktokHelper, document); +commonHelper.processDefaultCustomInstances('proxiTok', 'tor', tiktokHelper, document) + let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -102,17 +78,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.proxiTok.normal).then(r => { browser.storage.local.set({ proxiTokLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'normal', - tiktokHelper, - document, - tiktokHelper.getProxiTokNormalRedirectsChecks, - tiktokHelper.setProxiTokNormalRedirectsChecks, - tiktokHelper.getProxiTokNormalCustomRedirects, - tiktokHelper.setProxiTokNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('proxiTok', 'normal', tiktokHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 8f63ace9..f80854f1 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index d7b14abf..d553d72c 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/twitter/twitter.js b/src/pages/options/twitter/twitter.js index bd611497..b77f5ecc 100644 --- a/src/pages/options/twitter/twitter.js +++ b/src/pages/options/twitter/twitter.js @@ -21,8 +21,56 @@ let hlsPlayback = document.getElementById('nitter').getElementsByClassName('hlsP let proxyVideos = document.getElementById('nitter').getElementsByClassName('proxyVideos')[0]; let muteVideos = document.getElementById('nitter').getElementsByClassName('muteVideos')[0]; let autoplayGifs = document.getElementById('nitter').getElementsByClassName('autoplayGifs')[0]; - let nitterElement = document.getElementById("nitter"); + +browser.storage.local.get( + [ + "disableTwitter", + "twitterProtocol", + "enableTwitterCustomSettings", + "bypassWatchOnTwitter", + "nitterTheme", + "nitterInfiniteScroll", + "nitterStickyProfile", + "nitterBidiSupport", + "nitterHideTweetStats", + "nitterHideBanner", + "nitterHidePins", + "nitterHideReplies", + "nitterSquareAvatars", + "nitterMp4Playback", + "nitterHlsPlayback", + "nitterProxyVideos", + "nitterMuteVideos", + "nitterAutoplayGifs", + ], + r => { + disableTwitterElement.checked = !r.disableTwitter; + enableYoutubeCustomSettingsElement.checked = r.enableTwitterCustomSettings; + bypassWatchOnTwitterElement.checked = r.bypassWatchOnTwitter; + protocolElement.value = r.twitterProtocol; + changeProtocolSettings(r.twitterProtocol); + + // Display + theme.value = r.nitterTheme; + infiniteScroll.checked = r.nitterInfiniteScroll; + stickyProfile.checked = r.nitterStickyProfile; + bidiSupport.checked = r.nitterBidiSupport; + hideTweetStats.checked = r.nitterHideTweetStats; + hideBanner.checked = r.nitterHideBanner; + hidePins.checked = r.nitterHidePins; + hideReplies.checked = r.nitterHideReplies; + squareAvatars.checked = r.nitterSquareAvatars; + + // Media + mp4Playback.checked = r.nitterMp4Playback; + hlsPlayback.checked = r.nitterHlsPlayback; + proxyVideos.checked = r.nitterProxyVideos; + muteVideos.checked = r.nitterMuteVideos; + autoplayGifs.checked = r.nitterAutoplayGifs; + } +) + document.addEventListener("change", async () => { await browser.storage.local.set({ disableTwitter: !disableTwitterElement.checked, @@ -68,58 +116,8 @@ function changeProtocolSettings(protocol) { for (const item of customSettingsDivElement) item.style.display = 'none'; } -function init() { - twitterHelper.init().then(() => { - disableTwitterElement.checked = !twitterHelper.getDisable(); - enableYoutubeCustomSettingsElement.checked = twitterHelper.getEnableCustomSettings(); - bypassWatchOnTwitterElement.checked = twitterHelper.getBypassWatchOnTwitter(); - - let protocol = twitterHelper.getProtocol(); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - theme.value = twitterHelper.getTheme(); - infiniteScroll.checked = twitterHelper.getInfiniteScroll(); - stickyProfile.checked = twitterHelper.getStickyProfile(); - bidiSupport.checked = twitterHelper.getBidiSupport(); - hideTweetStats.checked = twitterHelper.getHideTweetStats(); - hideBanner.checked = twitterHelper.getHideBanner(); - hidePins.checked = twitterHelper.getHidePins(); - hideReplies.checked = twitterHelper.getHideReplies(); - squareAvatars.checked = twitterHelper.getSquareAvatars(); - mp4Playback.checked = twitterHelper.getMp4Playback(); - hlsPlayback.checked = twitterHelper.getHlsPlayback(); - proxyVideos.checked = twitterHelper.getProxyVideos(); - muteVideos.checked = twitterHelper.getMuteVideos(); - autoplayGifs.checked = twitterHelper.getAutoplayGifs(); - - browser.storage.local.get("nitterLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'nitter', - 'normal', - twitterHelper, - document, - twitterHelper.getNitterNormalRedirectsChecks, - twitterHelper.setNitterNormalRedirectsChecks, - twitterHelper.getNitterNormalCustomRedirects, - twitterHelper.setNitterNormalCustomRedirects, - r.nitterLatency, - ); - }); - - commonHelper.processDefaultCustomInstances( - 'nitter', - 'tor', - twitterHelper, - document, - twitterHelper.getNitterTorRedirectsChecks, - twitterHelper.setNitterTorRedirectsChecks, - twitterHelper.getNitterTorCustomRedirects, - twitterHelper.setNitterTorCustomRedirects - ) - }); -} -init(); - +// commonHelper.processDefaultCustomInstances('nitter', 'normal', twitterHelper, document); +// commonHelper.processDefaultCustomInstances('nitter', 'tor', twitterHelper, document) window.onblur = twitterHelper.initNitterCookies; let latencyElement = document.getElementById("latency"); @@ -135,17 +133,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.nitter.normal).then(r => { browser.storage.local.set({ nitterLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'nitter', - 'normal', - twitterHelper, - document, - twitterHelper.getNitterNormalRedirectsChecks, - twitterHelper.setNitterNormalRedirectsChecks, - twitterHelper.getNitterNormalCustomRedirects, - twitterHelper.setNitterNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('nitter', 'normal', twitterHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 246c269b..4d0f08cb 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
diff --git a/src/pages/options/wikipedia/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js index 526068b4..0d9a1a6c 100644 --- a/src/pages/options/wikipedia/wikipedia.js +++ b/src/pages/options/wikipedia/wikipedia.js @@ -2,18 +2,27 @@ import wikipediaHelper from "../../../assets/javascripts/helpers/wikipedia.js"; import commonHelper from "../../../assets/javascripts/helpers/common.js"; let disableWikipediaElement = document.getElementById("disable-wikipedia"); -disableWikipediaElement.addEventListener("change", - event => wikipediaHelper.setDisable(!event.target.checked) -); - let protocolElement = document.getElementById("protocol"); -protocolElement.addEventListener("change", - event => { - let protocol = event.target.options[protocolElement.selectedIndex].value - wikipediaHelper.setProtocol(protocol); - changeProtocolSettings(protocol); + +browser.storage.local.get( + [ + "disableWikipedia", + "wikipediaProtocol", + ], + r => { + disableWikipediaElement.checked = !r.disableWikipedia; + protocolElement.value = r.wikipediaProtocol; + changeProtocolSettings(r.wikipediaProtocol); } -); +) + +document.addEventListener("change", async () => { + await browser.storage.local.set({ + disableWikipedia: !disableWikipediaElement.checked, + wikipediaProtocol: protocolElement.value, + }) + changeProtocolSettings(protocolElement.value) +}) function changeProtocolSettings(protocol) { let normalDiv = document.getElementsByClassName("normal")[0]; @@ -35,51 +44,11 @@ function changeProtocolSettings(protocol) { i2pDiv.style.display = 'block'; } } +commonHelper.processDefaultCustomInstances('wikiless', 'normal', wikipediaHelper, document); +commonHelper.processDefaultCustomInstances('wikiless', 'tor', wikipediaHelper, document) +commonHelper.processDefaultCustomInstances('wikiless', 'i2p', wikipediaHelper, document) -wikipediaHelper.init().then(() => { - disableWikipediaElement.checked = !wikipediaHelper.getDisable(); - - let protocol = wikipediaHelper.getProtocol(); - console.log('protocol', protocol); - protocolElement.value = protocol; - changeProtocolSettings(protocol); - - browser.storage.local.get("wikilessLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'wikiless', - 'normal', - wikipediaHelper, - document, - wikipediaHelper.getWikilessNormalRedirectsChecks, - wikipediaHelper.setWikilessNormalRedirectsChecks, - wikipediaHelper.getWikilessNormalCustomRedirects, - wikipediaHelper.setWikilessNormalCustomRedirects, - r.wikilessLatency, - ); - }) - - commonHelper.processDefaultCustomInstances( - 'wikiless', - 'tor', - wikipediaHelper, - document, - wikipediaHelper.getWikilessTorRedirectsChecks, - wikipediaHelper.setWikilessTorRedirectsChecks, - wikipediaHelper.getWikilessTorCustomRedirects, - wikipediaHelper.setWikilessTorCustomRedirects - ) - - commonHelper.processDefaultCustomInstances( - 'wikiless', - 'i2p', - wikipediaHelper, - document, - wikipediaHelper.getWikilessI2pRedirectsChecks, - wikipediaHelper.setWikilessI2pRedirectsChecks, - wikipediaHelper.getWikilessI2pCustomRedirects, - wikipediaHelper.setWikilessI2pCustomRedirects - ) -}) +window.onblur = wikipediaHelper.initWikilessCookies; let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -94,17 +63,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.wikiless.normal).then(r => { browser.storage.local.set({ wikilessLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'wikiless', - 'normal', - wikipediaHelper, - document, - wikipediaHelper.getWikilessNormalRedirectsChecks, - wikipediaHelper.setWikilessNormalRedirectsChecks, - wikipediaHelper.getWikilessNormalCustomRedirects, - wikipediaHelper.setWikilessNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('wikiless', 'normal', wikipediaHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 569e7f12..aa257726 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Pixiv
Speedtest
Spotify
Wikipedia
@@ -182,7 +181,7 @@
-

Default comments

+

Default comments

- -
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 60146900..a7d6450a 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -14,7 +14,6 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -import pixivHelper from "../../assets/javascripts/helpers/pixiv.js"; import spotifyHelper from "../../assets/javascripts/helpers/spotify.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; @@ -36,7 +35,6 @@ let disableLbryElement = document.getElementById("disable-lbry"); let disableSendTargetsElement = document.getElementById("disable-sendTargets"); let disableImgurElement = document.getElementById("disable-imgur"); let disableTiktokElement = document.getElementById("disable-tiktok"); -let disablePixivElement = document.getElementById("disable-pixiv"); let disableSpotifyElement = document.getElementById("disable-spotify"); let copyRawElement = document.getElementById('copy_raw'); @@ -53,7 +51,6 @@ browser.storage.local.get( "disableWikipedia", "disableImgur", "disableTiktok", - "disablePixiv", "disableSpotifyTargets", "disableMedium", "disablePeertubeTargets", @@ -72,7 +69,6 @@ browser.storage.local.get( disableWikipediaElement.checked = !r.disableWikipedia; disableImgurElement.checked = !r.disableImgur; disableTiktokElement.checked = !r.disableTiktok; - disablePixivElement.checked = !r.disablePixiv; disableSpotifyElement.checked = !r.disableSpotifyTargets; disableMediumElement.checked = !r.disableMedium; disablePeertubeElement.checked = !r.disablePeertubeTargets; @@ -94,7 +90,6 @@ document.addEventListener("change", () => { disableWikipedia: !disableWikipediaElement.checked, disableImgur: !disableImgurElement.checked, disableTiktok: !disableTiktokElement.checked, - disablePixiv: !disablePixivElement.checked, disableSpotifyTargets: !disableSpotifyElement.checked, disableMedium: !disableMediumElement.checked, disablePeertubeTargets: !disablePeertubeElement.checked, -- cgit 1.4.1