devol/libredirect
1
0
Fork 0
mirror of https://codeberg.org/LibRedirect/libredirect.git synced 2025-02-09 16:48:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Piped-Material settings not working #86

Browse Source
This commit is contained in:
ManeraKai 2022-03-13 14:18:06 +03:00
parent c809a02f29
commit d26d4211b6
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
4 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/assets/javascripts/helpers/youtube/pipedMaterial-preferences.js
View File

@ -3,23 +3,24 @@ window.browser = window.browser || window.chrome;
browser.storage.local.get( browser.storage.local.get(
[ [
"theme", "theme",
"youtubeAutoplay" "applyThemeToSites",
"youtubeAutoplay",
], ],
res => { r => {
let prefs = JSON.parse( let applyThemeToSites = r.applyThemeToSites ?? false;
decodeURIComponent( let theme = r.theme ?? "DEFAULT";
localStorage.getItem("PREFERENCES") let youtubeAutoplay = r.youtubeAutoplay ?? "DEFAULT";
)
) ?? {};
let oldPrefs = { ...prefs };
if (res.theme == 'dark') prefs.darkMode = true; let prefs = {};
if (res.theme == 'light') prefs.darkMode = false; if (localStorage.getItem("PREFERENCES")) prefs = JSON.parse(localStorage.getItem("PREFERENCES"));
if (res.youtubeAutoplay != "DEFAULT") prefs.playerAutoplay = res.youtubeAutoplay; if (applyThemeToSites && theme == 'dark') prefs.darkMode = true;
if (applyThemeToSites && theme == 'light') prefs.darkMode = false;
if (oldPrefs != prefs) localStorage.setItem("PREFERENCES", encodeURIComponent(JSON.stringify(prefs))); if (youtubeAutoplay != "DEFAULT") prefs.playerAutoplay = youtubeAutoplay == 'true';
console.log("prefs", JSON.stringify(prefs));
localStorage.setItem("PREFERENCES", JSON.stringify(prefs));
} }
) )
window.onunload = () => localStorage.removeItem("PREFERENCES");

1
src/pages/background/background.js
View File

@ -157,6 +157,7 @@ browser.tabs.onUpdated.addListener(
try { url = new URL(changeInfo.url); } try { url = new URL(changeInfo.url); }
catch (_) { return } catch (_) { return }
if (youtubeHelper.isPipedorInvidious(url, 'main_frame', 'piped')) youtubeHelper.initPipedLocalStorage(tabId); if (youtubeHelper.isPipedorInvidious(url, 'main_frame', 'piped')) youtubeHelper.initPipedLocalStorage(tabId);
if (youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);
if (translateHelper.isTranslateRedirects(url, 'main_frame', 'lingva')) translateHelper.initLingvaLocalStorage(tabId); if (translateHelper.isTranslateRedirects(url, 'main_frame', 'lingva')) translateHelper.initLingvaLocalStorage(tabId);
if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url); if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url);
// if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId); // if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);

27
src/pages/options/youtube/youtube.html
View File

@ -130,7 +130,7 @@
<hr> <hr>
</div> </div>
<div id="invidious-piped"> <div id="invidious-piped-pipedMaterial">
<div class="some-block option-block"> <div class="some-block option-block">
<h4>Protocol</h4> <h4>Protocol</h4>
@ -162,6 +162,18 @@
<option value="false">False</option> <option value="false">False</option>
</select> </select>
</div> </div>
<div class="some-block option-block">
<h4>Volume: <span id="volume-value">--%</span></h4>
<input id="invidious-volume" name="invidious-volume" type="range" min="0" max="100" step="1" />
<button type="button" class="default" id="clear-invidious-volume">
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
<path d="M0 0h24v24H0V0z" fill="none" />
<path
d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" />
</svg>
</button>
</div>
</div> </div>
<div id="invidious"> <div id="invidious">
@ -265,19 +277,6 @@
</select> </select>
</div> </div>
<div class="some-block option-block">
<h4>Volume: <span id="volume-value">--%</span></h4>
<input id="invidious-volume" name="invidious-volume" type="range" min="0" max="100" step="1" />
<button type="button" class="default" id="clear-invidious-volume">
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
<path d="M0 0h24v24H0V0z" fill="none" />
<path
d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" />
</svg>
</button>
</div>
<div class="some-block option-block"> <div class="some-block option-block">
<h4>Default comments</h4> <h4>Default comments</h4>
<select id="invidious-comments[0]"> <select id="invidious-comments[0]">

23
src/pages/options/youtube/youtube.js
View File

@ -6,40 +6,33 @@ let youtubeFrontendElement = document.getElementById("youtube-frontend");
let invidiousDivElement = document.getElementById("invidious"); let invidiousDivElement = document.getElementById("invidious");
let pipedDivElement = document.getElementById("piped"); let pipedDivElement = document.getElementById("piped");
let pipedMaterialDivElement = document.getElementById("pipedMaterial"); let pipedMaterialDivElement = document.getElementById("pipedMaterial");
let invidiousPipedDivElement = document.getElementById("invidious-piped"); let invidiousPipedPipedMaterialDivElement = document.getElementById("invidious-piped-pipedMaterial");
let freetubeYatteeDivElement = document.getElementById("freetube-yatte"); let freetubeYatteeDivElement = document.getElementById("freetube-yatte");
function changeFrontendsSettings(frontend) { function changeFrontendsSettings(frontend) {
if (frontend == 'invidious') { if (frontend == 'invidious') {
invidiousPipedDivElement.style.display = 'block' invidiousPipedPipedMaterialDivElement.style.display = 'block'
invidiousDivElement.style.display = 'block'; invidiousDivElement.style.display = 'block';
pipedDivElement.style.display = 'none'; pipedDivElement.style.display = 'none';
pipedMaterialDivElement.style.display = 'none'; pipedMaterialDivElement.style.display = 'none';
freetubeYatteeDivElement.style.display = 'none'; freetubeYatteeDivElement.style.display = 'none';
} }
else if (frontend == 'piped') { else if (frontend == 'piped') {
invidiousPipedDivElement.style.display = 'block' invidiousPipedPipedMaterialDivElement.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'; invidiousDivElement.style.display = 'none';
pipedDivElement.style.display = 'block'; pipedDivElement.style.display = 'block';
pipedMaterialDivElement.style.display = 'none'; pipedMaterialDivElement.style.display = 'none';
freetubeYatteeDivElement.style.display = 'none'; freetubeYatteeDivElement.style.display = 'none';
} }
else if (frontend == 'pipedMaterial') { else if (frontend == 'pipedMaterial') {
invidiousPipedDivElement.style.display = 'none' invidiousPipedPipedMaterialDivElement.style.display = 'block'
invidiousDivElement.style.display = 'none'; invidiousDivElement.style.display = 'none';
pipedDivElement.style.display = 'none'; pipedDivElement.style.display = 'none';
pipedMaterialDivElement.style.display = 'block'; pipedMaterialDivElement.style.display = 'block';
freetubeYatteeDivElement.style.display = 'none'; freetubeYatteeDivElement.style.display = 'none';
} }
else if (frontend == 'freetube' || frontend == 'yatte') { else if (frontend == 'freetube' || frontend == 'yatte') {
invidiousPipedDivElement.style.display = 'none' invidiousPipedPipedMaterialDivElement.style.display = 'none'
invidiousDivElement.style.display = 'none'; invidiousDivElement.style.display = 'none';
pipedDivElement.style.display = 'none'; pipedDivElement.style.display = 'none';
pipedMaterialDivElement.style.display = 'none'; pipedMaterialDivElement.style.display = 'none';
@ -50,17 +43,17 @@ function changeFrontendsSettings(frontend) {
function changeYoutubeEmbedFrontendsSettings(youtubeEmbedFrontend) { function changeYoutubeEmbedFrontendsSettings(youtubeEmbedFrontend) {
if (youtubeEmbedFrontend == 'invidious') { if (youtubeEmbedFrontend == 'invidious') {
invidiousPipedDivElement.style.display = 'block' invidiousPipedPipedMaterialDivElement.style.display = 'block'
pipedDivElement.style.display = 'none'; pipedDivElement.style.display = 'none';
invidiousDivElement.style.display = 'block'; invidiousDivElement.style.display = 'block';
} }
if (youtubeEmbedFrontend == 'piped') { if (youtubeEmbedFrontend == 'piped') {
invidiousPipedDivElement.style.display = 'block' invidiousPipedPipedMaterialDivElement.style.display = 'block'
pipedDivElement.style.display = 'block'; pipedDivElement.style.display = 'block';
invidiousDivElement.style.display = 'none'; invidiousDivElement.style.display = 'none';
} }
else if (youtubeEmbedFrontend == 'youtube') { else if (youtubeEmbedFrontend == 'youtube') {
invidiousPipedDivElement.style.display = 'none' invidiousPipedPipedMaterialDivElement.style.display = 'none'
pipedDivElement.style.display = 'none'; pipedDivElement.style.display = 'none';
invidiousDivElement.style.display = 'none'; invidiousDivElement.style.display = 'none';
} }