From 53d93f5e8662c22d03f6b9f9df4a0d74a32b2df2 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 3 Feb 2022 13:16:34 +0300 Subject: [PATCH] Changing variable names --- src/_locales/de/messages.json | 8 ++-- src/_locales/en/messages.json | 12 ++--- src/_locales/es/messages.json | 10 ++-- src/_locales/fr/messages.json | 8 ++-- src/_locales/it/messages.json | 10 ++-- src/_locales/pl/messages.json | 8 ++-- src/_locales/ru/messages.json | 10 ++-- src/_locales/tr/messages.json | 8 ++-- src/_locales/zh_CN/messages.json | 8 ++-- src/assets/javascripts/helpers/instagram.js | 20 ++++---- src/assets/javascripts/helpers/maps.js | 20 ++++---- src/assets/javascripts/helpers/medium.js | 20 ++++---- src/assets/javascripts/helpers/translate.js | 22 ++++----- src/assets/javascripts/helpers/twitter.js | 20 ++++---- src/assets/javascripts/helpers/youtube.js | 33 ++++++------- .../javascripts/persist-invidious-prefs.js | 0 src/assets/javascripts/remove-twitter-sw.js | 16 +++---- src/pages/background/background.js | 4 +- src/pages/options/instagram.js | 8 ++-- src/pages/options/maps.js | 8 ++-- src/pages/options/medium.js | 8 ++-- src/pages/options/translate.js | 8 ++-- src/pages/options/twitter.js | 8 ++-- src/pages/options/youtube.js | 8 ++-- src/pages/popup/popup.js | 48 +++++++++---------- 25 files changed, 164 insertions(+), 169 deletions(-) delete mode 100644 src/assets/javascripts/persist-invidious-prefs.js diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index f8eb4b0e..ec39f4b9 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -23,19 +23,19 @@ "message": "OpenStreetMap-Instanz", "description": "Label for OSM instance field option (options)." }, - "disableNitter": { + "disableTwitter": { "message": "Nitter-Weiterleitungen", "description": "Label for enable/disable Nitter redirects option (options & pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Invidious-Weiterleitungen", "description": "Label for enable/disable Invidious redirects option (options & pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Bibliogram-Weiterleitungen", "description": "Label for enable/disable Bibliogram redirects option (options & pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "OpenStreetMap-Weiterleitungen", "description": "Label for enable/disable OSM redirects option (options & pop-up)." }, diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index da8516dd..865c0841 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -43,23 +43,23 @@ "message": "Wikipedia Instance", "description": "Label for Wikipedia instance field option (options)." }, - "disableNitter": { + "disableTwitter": { "message": "Nitter Redirects", "description": "Label for enable/disable Nitter redirects option (options & pop-up)." }, - "disableScribe": { + "disableMedium": { "message": "Scribe Redirects", "description": "Label for enable/disable Scribe redirects option (options & pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Invidious Redirects", "description": "Label for enable/disable Invidious redirects option (options & pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Bibliogram Redirects", "description": "Label for enable/disable Bibliogram redirects option (options & pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "OpenStreetMap Redirects", "description": "Label for enable/disable OSM redirects option (options & pop-up)." }, @@ -71,7 +71,7 @@ "message": "Search Engine Redirects", "description": "Label for enable/disable Search Engine redirects option (options & pop-up)." }, - "disableSimplyTranslate": { + "disableTranslate": { "message": "SimplyTranslate Redirects", "description": "Label for enable/disable SimplyTranslate redirects option (options & pop-up)." }, diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index 2ec41363..472f783b 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -39,19 +39,19 @@ "message": "Instancia de Wikipedia", "description": "Etiqueta del campo para la instancia de Wikipedia (opciones)." }, - "disableNitter": { + "disableTwitter": { "message": "Redirecciones de Nitter", "description": "Etiqueta para activar/desactivar la opción de redirecciones de Nitter (opciones y pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Redirecciones de Invidious", "description": "Etiqueta para activar/desactivar la opción de redirecciones de Invidious (opciones y pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Redirecciones de Bibliogram", "description": "Etiqueta para activar/desactivar la opción de redirecciones de Bibliogram (opciones y pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "Redirecciones de OpenStreetMap", "description": "Etiqueta para activar/desactivar la opción de redirecciones de OSM (opciones y pop-up)." }, @@ -63,7 +63,7 @@ "message": "Redirecciones de Buscador", "description": "Etiqueta para activar/desactivar la opción de redirecciones de Buscador (opciones y pop-up)." }, - "disableSimplyTranslate": { + "disableTranslate": { "message": "Redirecciones de SimplyTranslate", "description": "Etiqueta para activar/desactivar la opción de redirecciones de SimplyTranslate (opciones y pop-up)." }, diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json index 8467155b..5cb4e928 100644 --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -23,19 +23,19 @@ "message": "Instance de OpenStreetMap", "description": "Étiquette pour l'option de champ d'instance OpenStreetMap (options)." }, - "disableNitter": { + "disableTwitter": { "message": "Redirection vers Nitter", "description": "Étiquette pour activer / désactiver l'option de redirection vers Nitter (options et pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Redirection vers Invidious", "description": "Étiquette pour activer / désactiver l'option de redirection vers Invidious (options et pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Redirection vers Bibliogram", "description": "Étiquette pour activer / désactiver l'option de redirection vers Bibliogram (options et pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "Redirection vers OpenStreetMap", "description": "Étiquette pour activer / désactiver l'option de redirection vers OpenStreetMap (options et pop-up)." }, diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json index 12d2262b..25f2851f 100644 --- a/src/_locales/it/messages.json +++ b/src/_locales/it/messages.json @@ -35,19 +35,19 @@ "message": "Istanza di SimplyTranslate", "description": "Label for SimplyTranslate instance field option (options)." }, - "disableNitter": { + "disableTwitter": { "message": "Reindirizzamenti Nitter", "description": "Label for enable/disable Nitter redirects option (options & pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Reindirizzamenti Invidious", "description": "Label for enable/disable Invidious redirects option (options & pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Reindirizzamenti Bibliogram", "description": "Label for enable/disable Bibliogram redirects option (options & pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "Reindirizzamenti OpenStreetMap", "description": "Label for enable/disable OSM redirects option (options & pop-up)." }, @@ -59,7 +59,7 @@ "message": "Reindirizzamenti motore di ricerca", "description": "Label for enable/disable Search Engine redirects option (options & pop-up)." }, - "disableSimplyTranslate": { + "disableTranslate": { "message": "Reindirizzamenti SimplyTranslate", "description": "Label for enable/disable SimplyTranslate redirects option (options & pop-up)." }, diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json index 07cc95ad..3377ae17 100644 --- a/src/_locales/pl/messages.json +++ b/src/_locales/pl/messages.json @@ -23,19 +23,19 @@ "message": "Instancja OpenStreetMap", "description": "Etykieta dla pola wyboru instancji OpenStreetMap (opcje)." }, - "disableNitter": { + "disableTwitter": { "message": "Przekierowanie Nitter", "description": "Etykieta dla włączenia/wyłączenia opcji przekierowania Nitter (opcje i okno pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Przekierowanie Invidious ", "description": "Etykieta dla włączenia/wyłączenia opcji przekierowania Invidious (opcje i okno pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Przekierowanie Bibliogram", "description": "Etykieta dla włączenia/wyłączenia opcji przekierowania Bibliogram (opcje i okno pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "Przekierowanie OpenStreetMap", "description": "Etykieta dla włączenia/wyłączenia opcji przekierowania OpenStreetMap (opcje i okno pop-up)." }, diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 140ebd00..91d130c3 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -35,19 +35,19 @@ "message": "Сервис SimplyTranslate", "description": "Название настройки (в настройках) поля сервиса SimplyTranslate." }, - "disableNitter": { + "disableTwitter": { "message": "Перенаправление на Nitter", "description": "Название настройки для включения/выключения перенаправления на Nitter (в настройках и всплывающем окне)." }, - "disableInvidious": { + "disableYoutube": { "message": "Перенаправление на Invidious", "description": "Название настройки для включения/выключения перенаправления на Invidious redirects option (в настройках и всплывающем окне)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Перенаправление на Bibliogram", "description": "Название настройки для включения/выключения перенаправления на Bibliogram (в настройках и всплывающем окне)." }, - "disableOsm": { + "disableMaps": { "message": "Перенаправление на OpenStreetMap", "description": "Название настройки для включения/выключения перенаправления на OSM (в настройках и всплывающем окне)." }, @@ -59,7 +59,7 @@ "message": "Перенаправление поисковой системы", "description": "Название настройки для включения/выключения перенаправления поисковой системы (в настройках и всплывающем окне)." }, - "disableSimplyTranslate": { + "disableTranslate": { "message": "Перенаправление на SimplyTranslate", "description": "Название настройки для включения/выключения перенаправления на SimplyTranslate (в настройках и всплывающем окне)." }, diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json index b80bbb44..348ffaeb 100644 --- a/src/_locales/tr/messages.json +++ b/src/_locales/tr/messages.json @@ -31,19 +31,19 @@ "message": "Arama Motoru Servisi", "description": "Arama Motoru Servisi seçeneği için etiket (seçenekler)." }, - "disableNitter": { + "disableTwitter": { "message": "Nitter Yönlendirmesi", "description": "Nitter Yönlendirmesi'ni etkinleştirme/devre dışı bırakma seçeneği için etiket (seçenekler & açılır pencere)." }, - "disableInvidious": { + "disableYoutube": { "message": "Invidious Yönlendirmesi", "description": "Invidious Yönlendirmesi'ni etkinleştirme/devre dışı bırakma seçeneği için etiket (seçenekler & açılır pencere)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Bibliogram Yönlendirmesi", "description": "Bibliogram Yönlendirmesi'ni etkinleştirme/devre dışı bırakma seçeneği için etiket (seçenekler & açılır pencere)." }, - "disableOsm": { + "disableMaps": { "message": "OpenStreetMap Yönlendirmesi", "description": "OSM Yönlendirmesi'ni etkinleştirme/devre dışı bırakma seçeneği için etiket (seçenekler & açılır pencere)." }, diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 85dc1e0d..6fe05b68 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -23,19 +23,19 @@ "message": "OpenStreetMap 实例", "description": "Label for OSM instance field option (options)." }, - "disableNitter": { + "disableTwitter": { "message": "Nitter 重定向", "description": "Label for enable/disable Nitter redirects option (options & pop-up)." }, - "disableInvidious": { + "disableYoutube": { "message": "Invidious 重定向", "description": "Label for enable/disable Invidious redirects option (options & pop-up)." }, - "disableBibliogram": { + "disableInstagram": { "message": "Bibliogram 重定向", "description": "Label for enable/disable Bibliogram redirects option (options & pop-up)." }, - "disableOsm": { + "disableMaps": { "message": "OpenStreetMap 重定向", "description": "Label for enable/disable OSM redirects option (options & pop-up)." }, diff --git a/src/assets/javascripts/helpers/instagram.js b/src/assets/javascripts/helpers/instagram.js index 4c83a671..25d157bb 100644 --- a/src/assets/javascripts/helpers/instagram.js +++ b/src/assets/javascripts/helpers/instagram.js @@ -45,11 +45,11 @@ const reservedPaths = [ ]; const bypassPaths = /\/(accounts\/|embeds?.js)/; -let disableBibliogram; -const getDisableBibliogram = () => disableBibliogram; -function setDisableBibliogram(val) { - disableBibliogram = val; - browser.storage.sync.set({ disableBibliogram }) +let disableInstagram; +const getDisableInstagram = () => disableInstagram; +function setDisableInstagram(val) { + disableInstagram = val; + browser.storage.sync.set({ disableInstagram }) } let bibliogramInstance; @@ -62,7 +62,7 @@ function setBibliogramInstance(val) { async function redirect(url, initiator, type) { await init(); - if (disableBibliogram) + if (disableInstagram) return null; // Do not redirect Bibliogram view on Instagram links @@ -94,10 +94,10 @@ async function redirect(url, initiator, type) { async function init() { let result = await browser.storage.sync.get([ - "disableBibliogram", + "disableInstagram", "bibliogramInstance", ]) - disableBibliogram = result.disableBibliogram || false; + disableInstagram = result.disableInstagram || false; bibliogramInstance = result.bibliogramInstance; } @@ -106,8 +106,8 @@ export default { redirects, reservedPaths, bypassPaths, - getDisableBibliogram, - setDisableBibliogram, + getDisableInstagram, + setDisableInstagram, getBibliogramInstance, setBibliogramInstance, redirect, diff --git a/src/assets/javascripts/helpers/maps.js b/src/assets/javascripts/helpers/maps.js index 321d5174..e7aa5cf8 100644 --- a/src/assets/javascripts/helpers/maps.js +++ b/src/assets/javascripts/helpers/maps.js @@ -46,11 +46,11 @@ function addressToLatLng(address, callback) { xmlhttp.send(); } -let disableOsm; -const getDisableOsm = () => disableOsm; -function setDisableOsm(val) { - disableOsm = val; - browser.storage.sync.set({ disableOsm }) +let disableMaps; +const getDisableMaps = () => disableMaps; +function setDisableMaps(val) { + disableMaps = val; + browser.storage.sync.set({ disableMaps }) } let osmInstance; @@ -62,7 +62,7 @@ function setOsmInstance(val) { async function redirect(url, initiator) { await init() - if (disableOsm) + if (disableMaps) return null; if (initiator && initiator.host === "earth.google.com") @@ -143,10 +143,10 @@ async function redirect(url, initiator) { async function init() { let result = await browser.storage.sync.get([ - "disableOsm", + "disableMaps", "osmInstance", ]) - disableOsm = result.disableOsm; + disableMaps = result.disableMaps; osmInstance = result.osmInstance; } @@ -159,8 +159,8 @@ export default { travelModes, layers, addressToLatLng, - getDisableOsm, - setDisableOsm, + getDisableMaps, + setDisableMaps, getOsmInstance, setOsmInstance, redirect, diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/helpers/medium.js index 0d36fa49..a6376082 100644 --- a/src/assets/javascripts/helpers/medium.js +++ b/src/assets/javascripts/helpers/medium.js @@ -24,11 +24,11 @@ const redirects = { ] }; -let disableScribe; -const getDisableScribe = () => disableScribe; -function setDisableScribe(val) { - disableScribe = val; - browser.storage.sync.set({ disableScribe }) +let disableMedium; +const getDisableMedium = () => disableMedium; +function setDisableMedium(val) { + disableMedium = val; + browser.storage.sync.set({ disableMedium }) } @@ -41,7 +41,7 @@ function setScribeInstance(val) { async function redirect(url, initiator) { await init() - if (disableScribe) return null; + if (disableMedium) return null; if (url.pathname == "/") return null; @@ -62,18 +62,18 @@ async function redirect(url, initiator) { async function init() { let result = await browser.storage.sync.get([ - "disableScribe", + "disableMedium", "scribeInstance", ]) - disableScribe = result.disableScribe || false; + disableMedium = result.disableMedium || false; scribeInstance = result.scribeInstance; } export default { targets, redirects, - getDisableScribe, - setDisableScribe, + getDisableMedium, + setDisableMedium, getScribeInstance, setScribeInstance, redirect, diff --git a/src/assets/javascripts/helpers/translate.js b/src/assets/javascripts/helpers/translate.js index b9a783ff..61696e42 100644 --- a/src/assets/javascripts/helpers/translate.js +++ b/src/assets/javascripts/helpers/translate.js @@ -31,12 +31,12 @@ const redirects = { }; -let disableSimplyTranslate; -const getDisableSimplyTranslate = () => disableSimplyTranslate; -function setDisableSimplyTranslate(val) { - disableSimplyTranslate = val; - browser.storage.sync.set({ disableSimplyTranslate }) - console.log("disableSimplyTranslate: ", disableSimplyTranslate) +let disableTranslate; +const getDisableTranslate = () => disableTranslate; +function setDisableTranslate(val) { + disableTranslate = val; + browser.storage.sync.set({ disableTranslate }) + console.log("disableTranslate: ", disableTranslate) } let simplyTranslateInstance; @@ -56,7 +56,7 @@ function setFrontend(val) { async function redirect(url, initiator) { await init() - if (disableSimplyTranslate) { + if (disableTranslate) { console.log("SImplyTranslte disabled") return null }; @@ -86,11 +86,11 @@ async function redirect(url, initiator) { async function init() { let result = await browser.storage.sync.get([ - "disableSimplyTranslate", + "disableTranslate", "simplyTranslateInstance", "translateFrontend" ]); - disableSimplyTranslate = result.disableSimplyTranslate || false; + disableTranslate = result.disableTranslate || false; simplyTranslateInstance = result.simplyTranslateInstance; translateFrontend = result.translateFrontend || "simplyTransalte"; } @@ -98,8 +98,8 @@ async function init() { export default { targets, redirects, - getDisableSimplyTranslate, - setDisableSimplyTranslate, + getDisableTranslate, + setDisableTranslate, getSimplyTranslateInstance, setSimplyTranslateInstance, getFrontend, diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js index c622c341..9e5a8e75 100644 --- a/src/assets/javascripts/helpers/twitter.js +++ b/src/assets/javascripts/helpers/twitter.js @@ -44,11 +44,11 @@ const redirects = { ] }; -let disableNitter; -const getDisableNitter = () => disableNitter; -function setDisableNitter(val) { - disableNitter = val; - browser.storage.sync.set({ disableNitter }) +let disableTwitter; +const getDisableTwitter = () => disableTwitter; +function setDisableTwitter(val) { + disableTwitter = val; + browser.storage.sync.set({ disableTwitter }) } let nitterInstance; @@ -61,7 +61,7 @@ function setNitterInstance(val) { async function redirect(url, initiator) { await init(); - if (disableNitter) + if (disableTwitter) return null; if (url.pathname.split("/").includes("home")) { @@ -93,18 +93,18 @@ async function redirect(url, initiator) { async function init() { let result = await browser.storage.sync.get([ - "disableNitter", + "disableTwitter", "nitterInstance" ]); - disableNitter = result.disableNitter || false; + disableTwitter = result.disableTwitter || false; nitterInstance = result.nitterInstance; } export default { targets, redirects, - getDisableNitter, - setDisableNitter, + getDisableTwitter, + setDisableTwitter, getNitterInstance, setNitterInstance, redirect, diff --git a/src/assets/javascripts/helpers/youtube.js b/src/assets/javascripts/helpers/youtube.js index 957160a0..d89eb539 100644 --- a/src/assets/javascripts/helpers/youtube.js +++ b/src/assets/javascripts/helpers/youtube.js @@ -50,12 +50,12 @@ const redirects = { ] }; -let disableInvidious; -const getDisableInvidious = () => disableInvidious; -function setDisableInvidious(val) { - disableInvidious = val; - browser.storage.sync.set({ disableInvidious }) - console.log("disableInvidious: ", disableInvidious) +let disableYoutube; +const getDisableYoutube = () => disableYoutube; +function setDisableYoutube(val) { + disableYoutube = val; + browser.storage.sync.set({ disableYoutube }) + console.log("disableYoutube: ", disableYoutube) } let invidiousInstance; @@ -151,7 +151,7 @@ const getPersistInvidiousPrefs = () => persistInvidiousPrefs; async function redirect(url, initiator, type) { await init(); - if (disableInvidious) + if (disableYoutube) return null; if ( @@ -164,16 +164,11 @@ async function redirect(url, initiator, type) { ) return null; - if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) - // Don't redirect YouTube Player API. - return null; + if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return null; // Don't redirect YouTube Player API. - if (url.host.split(".")[0] === "studio") - // Avoid redirecting `studio.youtube.com` - return null; + if (url.host.split(".")[0] === "studio") return null; // Avoid redirecting `studio.youtube.com` - if (invidiousOnlyEmbeddedVideo && type !== "sub_frame") - return null; + if (invidiousOnlyEmbeddedVideo && type !== "sub_frame") return null; if (useFreeTube && type === "main_frame") return `freetube://${url}`; @@ -227,7 +222,7 @@ async function init() { "invidiousVideoQuality", "invidiousDarkMode", "persistInvidiousPrefs", - "disableInvidious", + "disableYoutube", "invidiousInstance", "invidiousAlwaysProxy", "invidiousOnlyEmbeddedVideo", @@ -239,7 +234,7 @@ async function init() { "invidiousAutoplay", "useFreeTube", ]); - disableInvidious = result.disableInvidious || false; + disableYoutube = result.disableYoutube || false; invidiousInstance = result.invidiousInstance; invidiousAlwaysProxy = result.invidiousAlwaysProxy || true; invidiousOnlyEmbeddedVideo = result.invidiousOnlyEmbeddedVideo || false; @@ -259,8 +254,8 @@ export default { redirects, redirect, - getDisableInvidious, - setDisableInvidious, + getDisableYoutube, + setDisableYoutube, setInvidiousInstance, getInvidiousInstance, diff --git a/src/assets/javascripts/persist-invidious-prefs.js b/src/assets/javascripts/persist-invidious-prefs.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/assets/javascripts/remove-twitter-sw.js b/src/assets/javascripts/remove-twitter-sw.js index 39282db1..36a8d9b3 100644 --- a/src/assets/javascripts/remove-twitter-sw.js +++ b/src/assets/javascripts/remove-twitter-sw.js @@ -19,7 +19,7 @@ const nitterInstances = [ "https://bird.trom.tf" ]; -let disableNitter; +let disableTwitter; let nitterInstance; let redirectBypassFlag; let exceptions; @@ -35,7 +35,7 @@ function isNotException(url) { } function shouldRedirect(url) { - return (!redirectBypassFlag && isNotException(url) && !disableNitter && url.host !== nitterInstance && !url.pathname.includes("/home")); + return (!redirectBypassFlag && isNotException(url) && !disableTwitter && url.host !== nitterInstance && !url.pathname.includes("/home")); } function redirectTwitter(url) { @@ -51,7 +51,7 @@ function redirectTwitter(url) { browser.storage.sync.get( [ "nitterInstance", - "disableNitter", + "disableTwitter", "removeTwitterSW", "redirectBypassFlag", "exceptions", @@ -60,7 +60,7 @@ browser.storage.sync.get( redirectBypassFlag = result.redirectBypassFlag; browser.storage.sync.set({ redirectBypassFlag: false }); if (!result.removeTwitterSW) { - disableNitter = result.disableNitter; + disableTwitter = result.disableTwitter; nitterInstance = result.nitterInstance || getRandomInstance(); exceptions = result.exceptions ? result.exceptions.map((e) => { @@ -89,7 +89,7 @@ browser.storage.sync.get( // //"use strict"; // -//let disableNitter; +//let disableTwitter; //let nitterInstance; //let redirectBypassFlag; //let exceptions; @@ -113,7 +113,7 @@ browser.storage.sync.get( // return ( // !redirectBypassFlag && // isNotException(url) && -// !disableNitter && +// !disableTwitter && // url.host !== nitterInstance && // !url.pathname.includes("/home") // ); @@ -132,7 +132,7 @@ browser.storage.sync.get( // browser.storage.sync.get( // [ // "nitterInstance", -// "disableNitter", +// "disableTwitter", // "removeTwitterSW", // "redirectBypassFlag", // "exceptions", @@ -143,7 +143,7 @@ browser.storage.sync.get( // redirectBypassFlag: false, // }); // if (!result.removeTwitterSW) { -// disableNitter = result.disableNitter; +// disableTwitter = result.disableTwitter; // nitterInstance = // result.nitterInstance || // commonHelper.default.getRandomInstance( diff --git a/src/pages/background/background.js b/src/pages/background/background.js index cc15e146..5ad6d134 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -144,7 +144,7 @@ browser.runtime.onInstalled.addListener((details) => { browser.storage.sync.get( [ "disableSearch", - "disableSimplyTranslate", + "disableTranslate", "disableWikipedia", "redditFrontend", "searchFrontend", @@ -153,7 +153,7 @@ browser.runtime.onInstalled.addListener((details) => { if (result.disableSearch === undefined) browser.storage.sync.set({ disableSearch: true }); - if (result.disableSimplyTranslate === undefined) browser.storage.sync.set({ disableSimplyTranslate: true }); + if (result.disableTranslate === undefined) browser.storage.sync.set({ disableTranslate: true }); if (result.disableWikipedia === undefined) browser.storage.sync.set({ disableWikipedia: true }); diff --git a/src/pages/options/instagram.js b/src/pages/options/instagram.js index 7be11ff1..b4e57def 100644 --- a/src/pages/options/instagram.js +++ b/src/pages/options/instagram.js @@ -1,11 +1,11 @@ import instagramHelper from "../../assets/javascripts/helpers/instagram.js"; -let disableBibliogramElement = document.getElementById("disable-bibliogram"); +let disableInstagramElement = document.getElementById("disable-bibliogram"); instagramHelper.init().then(() => { - disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram(); + disableInstagramElement.checked = !instagramHelper.getDisableInstagram(); }) -disableBibliogramElement.addEventListener("change", - (event) => instagramHelper.setDisableBibliogram(!event.target.checked) +disableInstagramElement.addEventListener("change", + (event) => instagramHelper.setDisableInstagram(!event.target.checked) ); \ No newline at end of file diff --git a/src/pages/options/maps.js b/src/pages/options/maps.js index b9845f69..9e5bb2cc 100644 --- a/src/pages/options/maps.js +++ b/src/pages/options/maps.js @@ -1,11 +1,11 @@ import mapsHelper from "../../assets/javascripts/helpers/maps.js"; -let disableOsmElement = document.getElementById("disable-osm"); +let disableMapsElement = document.getElementById("disable-osm"); mapsHelper.init().then(() => { - disableOsmElement.checked = !mapsHelper.getDisableOsm(); + disableMapsElement.checked = !mapsHelper.getDisableMaps(); }) -disableOsmElement.addEventListener("change", - (event) => mapsHelper.setDisableOsm(!event.target.checked) +disableMapsElement.addEventListener("change", + (event) => mapsHelper.setDisableMaps(!event.target.checked) ); \ No newline at end of file diff --git a/src/pages/options/medium.js b/src/pages/options/medium.js index 5f41282e..4f0377f5 100644 --- a/src/pages/options/medium.js +++ b/src/pages/options/medium.js @@ -1,11 +1,11 @@ import mediumHelper from "../../assets/javascripts/helpers/medium.js"; -let disableScribeElement = document.getElementById("disable-scribe"); +let disableMediumElement = document.getElementById("disable-scribe"); mediumHelper.init().then(() => { - disableScribeElement.checked = !mediumHelper.getDisableScribe(); + disableMediumElement.checked = !mediumHelper.getDisableMedium(); }) -disableScribeElement.addEventListener("change", - (event) => mediumHelper.setDisableScribe(!event.target.checked) +disableMediumElement.addEventListener("change", + (event) => mediumHelper.setDisableMedium(!event.target.checked) ); diff --git a/src/pages/options/translate.js b/src/pages/options/translate.js index 11a97340..5c1ff9f1 100644 --- a/src/pages/options/translate.js +++ b/src/pages/options/translate.js @@ -1,16 +1,16 @@ import googleTranslateHelper from "../../assets/javascripts/helpers/translate.js"; -let disableSimplyTranslateElement = document.getElementById("disable-simplyTranslate"); +let disableTranslateElement = document.getElementById("disable-simplyTranslate"); let translateFrontendElement = document.getElementById("translate-frontend"); googleTranslateHelper.init().then(() => { - disableSimplyTranslateElement.checked = !googleTranslateHelper.getDisableSimplyTranslate(); + disableTranslateElement.checked = !googleTranslateHelper.getDisableTranslate(); translateFrontendElement.value = googleTranslateHelper.getFrontend(); }); -disableSimplyTranslateElement.addEventListener("change", - (event) => googleTranslateHelper.setDisableSimplyTranslate(!event.target.checked) +disableTranslateElement.addEventListener("change", + (event) => googleTranslateHelper.setDisableTranslate(!event.target.checked) ); translateFrontendElement.addEventListener("change", diff --git a/src/pages/options/twitter.js b/src/pages/options/twitter.js index bf4f6b98..f8fdd8ce 100644 --- a/src/pages/options/twitter.js +++ b/src/pages/options/twitter.js @@ -1,15 +1,15 @@ import twitterHelper from "../../assets/javascripts/helpers/twitter.js"; let removeTwitterSWElement = document.getElementById("remove-twitter-sw"); -let disableNitterElement = document.getElementById("disable-nitter"); +let disableTwitterElement = document.getElementById("disable-nitter"); twitterHelper.init().then(() => { - disableNitterElement.checked = !twitterHelper.getDisableNitter(); + disableTwitterElement.checked = !twitterHelper.getDisableTwitter(); removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem }); -disableNitterElement.addEventListener("change", - (event) => twitterHelper.setDisableNitter(!event.target.checked) +disableTwitterElement.addEventListener("change", + (event) => twitterHelper.setDisableTwitter(!event.target.checked) ); removeTwitterSWElement.addEventListener("change", (event) => { diff --git a/src/pages/options/youtube.js b/src/pages/options/youtube.js index a05f4c14..9fac54f3 100644 --- a/src/pages/options/youtube.js +++ b/src/pages/options/youtube.js @@ -1,7 +1,7 @@ import youtubeHelper from "../../assets/javascripts/helpers/youtube.js"; import commonHelper from "../../assets/javascripts/helpers/common.js"; -let disableInvidiousElement = document.getElementById("disable-invidious"); +let disableYoutubeElement = document.getElementById("disable-invidious"); let invidiousDarkModeElement = document.getElementById("invidious-dark-mode"); let persistInvidiousPrefsElement = document.getElementById("persist-invidious-prefs"); let invidiousVolumeElement = document.getElementById("invidious-volume"); @@ -15,7 +15,7 @@ let invidiousVideoQualityElement = document.getElementById("video-quality"); let invidiousVolumeValueElement = document.querySelector("#volume-value"); youtubeHelper.init().then(() => { - disableInvidiousElement.checked = !youtubeHelper.getDisableInvidious(); + disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube(); invidiousDarkModeElement.checked = youtubeHelper.getInvidiousDarkMode(); persistInvidiousPrefsElement.checked = youtubeHelper.getPersistInvidiousPrefs(); invidiousVolumeElement.value = youtubeHelper.getInvidiousVolume(); @@ -30,8 +30,8 @@ youtubeHelper.init().then(() => { }); -disableInvidiousElement.addEventListener("change", - (event) => youtubeHelper.setDisableInvidious(!event.target.checked) +disableYoutubeElement.addEventListener("change", + (event) => youtubeHelper.setDisableYoutube(!event.target.checked) ); invidiousDarkModeElement.addEventListener("change", diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 8ce57e3a..5362c79a 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -12,15 +12,15 @@ import translateHelper from "../../assets/javascripts/helpers/translate.js"; import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; -let disableNitterElement = document.querySelector("#disable-nitter"); -let disableInvidiousElement = document.querySelector("#disable-invidious"); -let disableBibliogramElement = document.querySelector("#disable-bibliogram"); -let disableOsmElement = document.querySelector("#disable-osm"); +let disableTwitterElement = document.querySelector("#disable-nitter"); +let disableYoutubeElement = document.querySelector("#disable-invidious"); +let disableInstagramElement = document.querySelector("#disable-bibliogram"); +let disableMapsElement = document.querySelector("#disable-osm"); let disableRedditElement = document.querySelector("#disable-reddit"); let disableSearchElement = document.querySelector("#disable-search"); -let disableSimplyTranslateElement = document.querySelector("#disable-simplyTranslate"); +let disableTranslateElement = document.querySelector("#disable-simplyTranslate"); let disableWikipediaElement = document.querySelector("#disable-wikipedia"); -let disableScribeElement = document.querySelector("#disable-scribe"); +let disableMediumElement = document.querySelector("#disable-scribe"); window.browser = window.browser || window.chrome; @@ -39,31 +39,31 @@ async function wholeInit() { wholeInit().then(() => { if (data.theme) document.body.classList.add(data.theme); - disableNitterElement.checked = !twitterHelper.getDisableNitter(); - disableInvidiousElement.checked = !youtubeHelper.getDisableInvidious(); - disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram(); - disableOsmElement.checked = !mapsHelper.getDisableOsm(); + disableTwitterElement.checked = !twitterHelper.getDisableTwitter(); + disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube(); + disableInstagramElement.checked = !instagramHelper.getDisableInstagram(); + disableMapsElement.checked = !mapsHelper.getDisableMaps(); disableRedditElement.checked = !redditHelper.getDisableReddit(); disableSearchElement.checked = !searchHelper.getDisableSearch(); - disableSimplyTranslateElement.checked = !translateHelper.getDisableSimplyTranslate(); + disableTranslateElement.checked = !translateHelper.getDisableTranslate(); disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia(); - disableScribeElement.checked = !mediumHelper.getDisableScribe(); + disableMediumElement.checked = !mediumHelper.getDisableMedium(); }) -disableNitterElement.addEventListener("change", - (event) => twitterHelper.setDisableNitter(!event.target.checked) +disableTwitterElement.addEventListener("change", + (event) => twitterHelper.setDisableTwitter(!event.target.checked) ); -disableInvidiousElement.addEventListener("change", - (event) => youtubeHelper.setDisableInvidious(!event.target.checked) +disableYoutubeElement.addEventListener("change", + (event) => youtubeHelper.setDisableYoutube(!event.target.checked) ); -disableBibliogramElement.addEventListener("change", - (event) => instagramHelper.setDisableBibliogram(!event.target.checked) +disableInstagramElement.addEventListener("change", + (event) => instagramHelper.setDisableInstagram(!event.target.checked) ); -disableOsmElement.addEventListener("change", - (event) => mapsHelper.setDisableOsm(!event.target.checked) +disableMapsElement.addEventListener("change", + (event) => mapsHelper.setDisableMaps(!event.target.checked) ); disableRedditElement.addEventListener("change", @@ -74,16 +74,16 @@ disableSearchElement.addEventListener("change", (event) => searchHelper.setDisableSearch(!event.target.checked) ); -disableSimplyTranslateElement.addEventListener("change", - (event) => translateHelper.setDisableSimplyTranslate(!event.target.checked) +disableTranslateElement.addEventListener("change", + (event) => translateHelper.setDisableTranslate(!event.target.checked) ); disableWikipediaElement.addEventListener("change", (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked) ); -disableScribeElement.addEventListener("change", - (event) => mediumHelper.setDisableScribe(!event.target.checked) +disableMediumElement.addEventListener("change", + (event) => mediumHelper.setDisableMedium(!event.target.checked) ); document.querySelector("#update-instances").addEventListener("click", () => {