diff options
Diffstat (limited to 'src/assets/javascripts')
-rw-r--r-- | src/assets/javascripts/helpers/instagram.js | 20 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/maps.js | 20 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/medium.js | 20 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/translate.js | 22 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/twitter.js | 20 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/youtube.js | 33 | ||||
-rw-r--r-- | src/assets/javascripts/persist-invidious-prefs.js | 0 | ||||
-rw-r--r-- | src/assets/javascripts/remove-twitter-sw.js | 16 |
8 files changed, 73 insertions, 78 deletions
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 --- a/src/assets/javascripts/persist-invidious-prefs.js +++ /dev/null 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( |