From b62c79adf867d4fe9401d82d22c4a00b3e292da7 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Sun, 14 Aug 2022 15:11:50 +0300
Subject: Removed embedded only
 https://github.com/libredirect/libredirect/issues/410

---
 src/pages/background/background.js    | 3 +--
 src/pages/options/index.html          | 3 ---
 src/pages/options/widgets/lbry.pug    | 1 -
 src/pages/options/widgets/twitter.pug | 1 -
 src/pages/options/widgets/youtube.pug | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 39c10052..7e37bade 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -26,7 +26,6 @@ import frontend from "../../assets/javascripts/frontend.js"
 
 window.browser = window.browser || window.chrome
 
-
 browser.runtime.onInstalled.addListener(details => {
 	function initDefaults() {
 		fetch("/instances/blacklist.json")
@@ -90,7 +89,7 @@ browser.webRequest.onBeforeRequest.addListener(
 		}
 
 		let newUrl = youtubeMusicHelper.redirect(url, details.type)
-		if (!newUrl) newUrl = youtubeHelper.redirect(url, details.type, initiator)
+		if (!newUrl) newUrl = youtubeHelper.redirect(url, details.type, details.tabId, initiator)
 		if (!newUrl) newUrl = twitterHelper.redirect(url, details.type, initiator)
 		if (!newUrl) newUrl = instagramHelper.redirect(url, details.type, initiator)
 		if (!newUrl) newUrl = mapsHelper.redirect(url, initiator)
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index b8541ff9..af417403 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -312,7 +312,6 @@
           <h4 data-localise="__MSG_redirectType__">Redirect Type</h4>
           <select id="youtube-redirect_type">
             <option value="both" data-localise="__MSG_both__">both</option>
-            <option value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
             <option value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
           </select>
         </div>
@@ -925,7 +924,6 @@
           <h4 data-localise="__MSG_redirectType__">Redirect Type</h4>
           <select id="twitter-redirect_type">
             <option value="both" data-localise="__MSG_both__">both</option>
-            <option value="sub_frame" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
             <option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
           </select>
         </div>
@@ -2220,7 +2218,6 @@
           <h4 data-localise="__MSG_redirectType__">Redirect Type</h4>
           <select id="lbry-redirect_type">
             <option value="both" data-localise="__MSG_both__">both</option>
-            <option value="sub_frame" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
             <option value="main_frame" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
           </select>
         </div>
diff --git a/src/pages/options/widgets/lbry.pug b/src/pages/options/widgets/lbry.pug
index e4278438..327c938b 100644
--- a/src/pages/options/widgets/lbry.pug
+++ b/src/pages/options/widgets/lbry.pug
@@ -16,7 +16,6 @@ section#lbry_page.option-block
         h4(data-localise="__MSG_redirectType__") Redirect Type
         select#lbry-redirect_type
             option(value="both" data-localise="__MSG_both__") both
-            option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded
             option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
 
     #librarian
diff --git a/src/pages/options/widgets/twitter.pug b/src/pages/options/widgets/twitter.pug
index 6e610545..137e1efb 100644
--- a/src/pages/options/widgets/twitter.pug
+++ b/src/pages/options/widgets/twitter.pug
@@ -10,7 +10,6 @@ section#twitter_page.option-block
         h4(data-localise="__MSG_redirectType__") Redirect Type
         select#twitter-redirect_type
             option(value="both" data-localise="__MSG_both__") both
-            option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded
             option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
 
     #nitter
diff --git a/src/pages/options/widgets/youtube.pug b/src/pages/options/widgets/youtube.pug
index 33a43c34..66faa60a 100644
--- a/src/pages/options/widgets/youtube.pug
+++ b/src/pages/options/widgets/youtube.pug
@@ -29,7 +29,6 @@ section#youtube_page.option-block
         h4(data-localise="__MSG_redirectType__") Redirect Type
         select#youtube-redirect_type
             option(value="both" data-localise="__MSG_both__") both
-            option(value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__") Only Embedded
             option(value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
 
     #invidious
-- 
cgit 1.4.1