From 3ef2aa7cc112a9c0dad8cf4dc71afcb657ba095d Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 3 Mar 2022 22:13:17 +0300 Subject: Added Piped-Material #51 --- src/pages/background/background.js | 1 + src/pages/options/youtube/piped.js | 8 ----- src/pages/options/youtube/pipedMaterial.js | 25 ++++++++++++++ src/pages/options/youtube/youtube.html | 54 ++++++++++++++++++++++++++++++ src/pages/options/youtube/youtube.js | 42 +++++++++++++++++++---- 5 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 src/pages/options/youtube/pipedMaterial.js (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index c35e240c..7098f6e0 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -110,5 +110,6 @@ browser.tabs.onRemoved.addListener((tabId) => { browser.tabs.onUpdated.addListener( (tabId, changeInfo, _) => { if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'piped')) youtubeHelper.initPipedLocalStorage(tabId); + if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId); // if (changeInfo.url && youtubeHelper.isUrlPipedorInvidious(changeInfo.url, 'invidious')) youtubeHelper.initInvidiousCookies(tabId); }); \ No newline at end of file diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js index 6c541a8d..c6517966 100644 --- a/src/pages/options/youtube/piped.js +++ b/src/pages/options/youtube/piped.js @@ -23,11 +23,3 @@ youtubeHelper.init().then(() => { youtubeHelper.setPipedTorCustomRedirects ); }); - - - - - - - - diff --git a/src/pages/options/youtube/pipedMaterial.js b/src/pages/options/youtube/pipedMaterial.js new file mode 100644 index 00000000..9a8a9610 --- /dev/null +++ b/src/pages/options/youtube/pipedMaterial.js @@ -0,0 +1,25 @@ +import youtubeHelper from "../../../assets/javascripts/helpers/youtube/youtube.js"; +import commonHelper from "../../../assets/javascripts/helpers/common.js"; + +youtubeHelper.init().then(() => { + commonHelper.processDefaultCustomInstances( + 'pipedMaterial', + 'normal', + youtubeHelper, + document, + youtubeHelper.getPipedMaterialNormalRedirectsChecks, + youtubeHelper.setPipedMaterialNormalRedirectsChecks, + youtubeHelper.getPipedMaterialNormalCustomRedirects, + youtubeHelper.setPipedMaterialNormalCustomRedirects + ); + commonHelper.processDefaultCustomInstances( + 'pipedMaterial', + 'tor', + youtubeHelper, + document, + youtubeHelper.getPipedMaterialTorRedirectsChecks, + youtubeHelper.setPipedMaterialTorRedirectsChecks, + youtubeHelper.getPipedMaterialTorCustomRedirects, + youtubeHelper.setPipedMaterialTorCustomRedirects + ); +}); diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index add3276c..27c0ceff 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -112,6 +112,7 @@ @@ -321,6 +322,58 @@ +
+
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
@@ -355,6 +408,7 @@ + diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js index 168a9d30..61c02e98 100644 --- a/src/pages/options/youtube/youtube.js +++ b/src/pages/options/youtube/youtube.js @@ -5,26 +5,44 @@ let disableYoutubeElement = document.getElementById("disable-invidious"); let youtubeFrontendElement = document.getElementById("youtube-frontend"); let invidiousDivElement = document.getElementById("invidious"); let pipedDivElement = document.getElementById("piped"); +let pipedMaterialDivElement = document.getElementById("pipedMaterial"); let invidiousPipedDivElement = document.getElementById("invidious-piped"); let freetubeYatteeDivElement = document.getElementById("freetube-yatte"); function changeFrontendsSettings(frontend) { - if (frontend == 'piped') { + if (frontend == 'invidious') { invidiousPipedDivElement.style.display = 'block' + invidiousDivElement.style.display = 'block'; + pipedDivElement.style.display = 'none'; + pipedMaterialDivElement.style.display = 'none'; + freetubeYatteeDivElement.style.display = 'none'; + } + else if (frontend == 'piped') { + invidiousPipedDivElement.style.display = 'block' + invidiousDivElement.style.display = 'none'; pipedDivElement.style.display = 'block'; + pipedMaterialDivElement.style.display = 'none'; + freetubeYatteeDivElement.style.display = 'none'; + } + else if (frontend == 'piped') { + invidiousPipedDivElement.style.display = 'block' invidiousDivElement.style.display = 'none'; + pipedDivElement.style.display = 'block'; + pipedMaterialDivElement.style.display = 'none'; freetubeYatteeDivElement.style.display = 'none'; } - else if (frontend == 'invidious') { + else if (frontend == 'pipedMaterial') { invidiousPipedDivElement.style.display = 'block' + invidiousDivElement.style.display = 'none'; pipedDivElement.style.display = 'none'; - invidiousDivElement.style.display = 'block'; + pipedMaterialDivElement.style.display = 'block'; freetubeYatteeDivElement.style.display = 'none'; } else if (frontend == 'freetube' || frontend == 'yatte') { invidiousPipedDivElement.style.display = 'none' - pipedDivElement.style.display = 'none'; invidiousDivElement.style.display = 'none'; + pipedDivElement.style.display = 'none'; + pipedMaterialDivElement.style.display = 'none'; freetubeYatteeDivElement.style.display = 'block'; changeYoutubeEmbedFrontendsSettings(youtubeHelper.getYoutubeEmbedFrontend()); } @@ -118,19 +136,31 @@ function changeProtocolSettings(protocol) { let normalPipedDiv = document.getElementById("piped-normal"); let torPipedDiv = document.getElementById("piped-tor"); + let normalPipedMaterialDiv = document.getElementById("pipedMaterial-normal"); + let torPipedMaterialDiv = document.getElementById("pipedMaterial-tor"); + let normalInvidiousDiv = document.getElementById("invidious-normal"); let torInvidiousDiv = document.getElementById("invidious-tor"); + if (protocol == 'normal') { - normalPipedDiv.style.display = 'block'; normalInvidiousDiv.style.display = 'block'; torInvidiousDiv.style.display = 'none'; + + normalPipedDiv.style.display = 'block'; torPipedDiv.style.display = 'none'; + + normalPipedMaterialDiv.style.display = 'block'; + torPipedMaterialDiv.style.display = 'none'; } else if (protocol == 'tor') { - normalPipedDiv.style.display = 'none'; normalInvidiousDiv.style.display = 'none'; torInvidiousDiv.style.display = 'block'; + + normalPipedDiv.style.display = 'none'; torPipedDiv.style.display = 'block'; + + normalPipedMaterialDiv.style.display = 'none'; + torPipedMaterialDiv.style.display = 'block'; } } -- cgit 1.4.1