diff options
| author | ManeraKai <manerakai@protonmail.com> | 2022-08-14 15:11:50 +0300 |
|---|---|---|
| committer | ManeraKai <manerakai@protonmail.com> | 2022-08-14 15:11:50 +0300 |
| commit | b62c79adf867d4fe9401d82d22c4a00b3e292da7 (patch) | |
| tree | 584bd221653fd684aadd9c0f1591e86106e7046e /src/assets | |
| parent | Merge https://github.com/libredirect/libredirect (diff) | |
| download | libredirect-b62c79adf867d4fe9401d82d22c4a00b3e292da7.zip | |
Removed embedded only https://github.com/libredirect/libredirect/issues/410
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/javascripts/lbry.js | 2 | ||||
| -rw-r--r-- | src/assets/javascripts/twitter.js | 1 | ||||
| -rw-r--r-- | src/assets/javascripts/youtube/youtube.js | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/assets/javascripts/lbry.js b/src/assets/javascripts/lbry.js index 5819d132..698517a9 100644 --- a/src/assets/javascripts/lbry.js +++ b/src/assets/javascripts/lbry.js @@ -152,7 +152,7 @@ function redirect(url, type, initiator, disableOverride) { if (disableLbryTargets && !disableOverride) return if (initiator && (all().includes(initiator.origin) || targets.includes(initiator.host))) return if (!targets.some(rx => rx.test(url.href))) return - if ((type == "main_frame" && lbryRedirectType == "sub_frame") || (type == "sub_frame" && lbryRedirectType == "main_frame")) return + if (type == "sub_frame" && lbryRedirectType == "main_frame") return const instancesList = getInstancesList() switch (type) { diff --git a/src/assets/javascripts/twitter.js b/src/assets/javascripts/twitter.js index 2f68dfc2..5704d259 100644 --- a/src/assets/javascripts/twitter.js +++ b/src/assets/javascripts/twitter.js @@ -97,7 +97,6 @@ function redirect(url, type, initiator, disableOverride) { if (!targets.some(rx => rx.test(url.href))) return if (url.pathname.split("/").includes("home")) return if (initiator && all().includes(initiator.origin)) return "BYPASSTAB" - if (twitterRedirectType == "sub_frame" && type == "main_frame") return if (twitterRedirectType == "main_frame" && type != "main_frame") return let instancesList = [] diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index c3442246..7b215704 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -327,14 +327,13 @@ function getInstanceList(type) { return instancesList } -function redirect(url, type, initiator, disableOverride) { +function redirect(url, type, tabId, initiator, disableOverride) { if (disableYoutube && !disableOverride) return if (!targets.some(rx => rx.test(url.href))) return if (initiator && all().includes(initiator.origin)) return "BYPASSTAB" if (type != ("main_frame" || "sub_frame")) return if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return // Don't redirect YouTube Player API. - if (onlyEmbeddedVideo == "onlyEmbedded" && type == "main_frame") return if (onlyEmbeddedVideo == "onlyNotEmbedded" && type == "sub_frame") return if (type == "main_frame") { |