diff options
author | BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co> | 2022-07-24 16:30:41 +0100 |
---|---|---|
committer | BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co> | 2022-07-24 16:30:41 +0100 |
commit | a43f0a7e7fa563db3b0593dc1ca588559381e1d0 (patch) | |
tree | 9191c5488edf965d448fd4b1dbaa9a4139868a5a /src/assets | |
parent | Merge branch 'BobIsMyManager-librex' (diff) | |
download | libredirect-a43f0a7e7fa563db3b0593dc1ca588559381e1d0.zip |
Squashed a few bugs
Closes https://github.com/libredirect/libredirect/issues/392
Diffstat (limited to 'src/assets')
-rw-r--r-- | src/assets/javascripts/search.js | 2 | ||||
-rw-r--r-- | src/assets/javascripts/youtube/youtube.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/assets/javascripts/search.js b/src/assets/javascripts/search.js index 7644ad4b..15272aa9 100644 --- a/src/assets/javascripts/search.js +++ b/src/assets/javascripts/search.js @@ -530,7 +530,7 @@ function switchInstance(url, disableOverride) { ...librexLokiCustomRedirects ].includes(protocolHost)) { resolve(); return; } - let instancesList; + let instancesList = []; if (protocol == 'loki') { if (searchFrontend == 'searx') instancesList = [...searxLokiCustomRedirects]; diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index 669b26d5..72763c46 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -140,7 +140,7 @@ function init() { pipedMaterialNormalCustomRedirects = r.pipedMaterialNormalCustomRedirects; pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks; pipedMaterialTorCustomRedirects = r.pipedMaterialTorCustomRedirects; - pipedMaterialI2pCustomRedirects - r.pipedMaterialI2pCustomRedirects; + pipedMaterialI2pCustomRedirects = r.pipedMaterialI2pCustomRedirects; pipedMaterialLokiCustomRedirects = r.pipedMaterialLokiCustomRedirects; resolve(); } @@ -198,6 +198,7 @@ function redirect(url, type, initiator, disableOverride) { const main_frame = type === "main_frame"; const sub_frame = type === "sub_frame"; + if (!sub_frame && !main_frame) return; if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return; // Don't redirect YouTube Player API. if (onlyEmbeddedVideo == 'onlyEmbedded' && main_frame) return; if (onlyEmbeddedVideo == 'onlyNotEmbedded' && !main_frame) return; |