From c50b4bbb082f0931fbfc92647d8b7516030b1803 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Mon, 14 Mar 2022 22:10:08 +0300 Subject: Added almost all Piped-Material settings --- src/pages/options/youtube/piped.js | 91 ++++++++++++++++++++++++++++++++-- src/pages/options/youtube/youtube.html | 78 ++++++++++++++++++++++++++++- src/pages/options/youtube/youtube.js | 6 +-- 3 files changed, 166 insertions(+), 9 deletions(-) (limited to 'src/pages/options') diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js index 0425ae79..015c97d8 100644 --- a/src/pages/options/youtube/piped.js +++ b/src/pages/options/youtube/piped.js @@ -17,9 +17,9 @@ function selectSkipModify(value, boolean) { youtubeHelper.setPipedSelectedSkip(selectSkip) } -let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsor"); +let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsors"); pipedSelectedSkipSponsorElement.addEventListener("change", - event => selectSkipModify('sponsor', event.target.checked) + event => selectSkipModify('sponsors', event.target.checked) ); let pipedSelectedSkipIntroElement = document.getElementById("piped-selectedSkip-intro"); @@ -122,12 +122,83 @@ pipedProxyLBRYElement.addEventListener("change", event => youtubeHelper.setPipedProxyLBRY(event.target.checked) ); +let pipedMaterialListenElement = document.getElementById("pipedMaterial-listen"); +pipedMaterialListenElement.addEventListener("change", + event => youtubeHelper.setYoutubeListen(event.target.checked) +); + +let pipedMaterialDisableLBRYElement = document.getElementById("pipedMaterial-disableLBRY"); +pipedMaterialDisableLBRYElement.addEventListener("change", + event => youtubeHelper.setPipedDisableLBRY(event.target.checked) +); + +let pipedMaterialProxyLBRYElement = document.getElementById("pipedMaterial-proxyLBRY"); +pipedMaterialProxyLBRYElement.addEventListener("change", + event => youtubeHelper.setPipedProxyLBRY(event.target.checked) +); + +let pipedMaterialSponsorblockElement = document.getElementById("pipedMaterial-sponsorblock"); +pipedMaterialSponsorblockElement.addEventListener("change", + event => youtubeHelper.setPipedSponsorblock(event.target.checked) +); + +let pipedMaterialSkipToLastPointElement = document.getElementById("pipedMaterial-skipToLastPoint"); +pipedMaterialSkipToLastPointElement.addEventListener("change", + event => youtubeHelper.setPipedMaterialSkipToLastPoint(event.target.checked) +); + + +let pipedMaterialSelectedSkipSponsorElement = document.getElementById("pipedMaterial-selectedSkip-sponsors"); +pipedMaterialSelectedSkipSponsorElement.addEventListener("change", + event => selectSkipModify('sponsors', event.target.checked) +); + +let pipedMaterialSelectedSkipIntroElement = document.getElementById("pipedMaterial-selectedSkip-intro"); +pipedMaterialSelectedSkipIntroElement.addEventListener("change", + event => selectSkipModify('intro', event.target.checked) +); + +let pipedMaterialSelectedSkipOutroElement = document.getElementById("pipedMaterial-selectedSkip-outro"); +pipedMaterialSelectedSkipOutroElement.addEventListener("change", + event => selectSkipModify('outro', event.target.checked) +); + +let pipedMaterialSelectedSkipPreviewElement = document.getElementById("pipedMaterial-selectedSkip-preview"); +pipedMaterialSelectedSkipPreviewElement.addEventListener("change", + event => selectSkipModify('preview', event.target.checked) +); + +let pipedMaterialSelectedSkipInteractionElement = document.getElementById("pipedMaterial-selectedSkip-interaction"); +pipedMaterialSelectedSkipInteractionElement.addEventListener("change", + event => selectSkipModify('interaction', event.target.checked) +); + +let pipedMaterialSelectedSkipSelfpromoElement = document.getElementById("pipedMaterial-selectedSkip-selfpromo"); +pipedMaterialSelectedSkipSelfpromoElement.addEventListener("change", + event => selectSkipModify('selfpromo', event.target.checked) +); + +let pipedMaterialSelectedSkipMusicOfftopicElement = document.getElementById("pipedMaterial-selectedSkip-music_offtopic"); +pipedMaterialSelectedSkipMusicOfftopicElement.addEventListener("change", + event => selectSkipModify('music_offtopic', event.target.checked) +); + +let pipedMaterialSelectedSkipPoiHighlightElement = document.getElementById("pipedMaterial-selectedSkip-poi_highlight"); +pipedMaterialSelectedSkipPoiHighlightElement.addEventListener("change", + event => selectSkipModify('poi_highlight', event.target.checked) +); + +let pipedMaterialSelectedSkipFillerElement = document.getElementById("pipedMaterial-selectedSkip-filler"); +pipedMaterialSelectedSkipFillerElement.addEventListener("change", + event => selectSkipModify('filler', event.target.checked) +); + let selectSkip = []; youtubeHelper.init().then(() => { pipedSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock(); selectSkip = youtubeHelper.getPipedSelectedSkip(); - pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsor'); + pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors'); pipedSelectedSkipIntroElement.checked = selectSkip.includes('intro'); pipedSelectedSkipOutroElement.checked = selectSkip.includes('outro'); pipedSelectedSkipPreviewElement.checked = selectSkip.includes('preview'); @@ -148,6 +219,20 @@ youtubeHelper.init().then(() => { pipedDisableLBRYElement.checked = youtubeHelper.getPipedDisableLBRY(); pipedProxyLBRYElement.checked = youtubeHelper.getPipedProxyLBRY(); + pipedMaterialListenElement.checked = youtubeHelper.getYoutubeListen(); + pipedMaterialDisableLBRYElement.checked = youtubeHelper.getPipedDisableLBRY(); + pipedMaterialProxyLBRYElement.checked = youtubeHelper.getPipedProxyLBRY(); + pipedMaterialSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock() + pipedMaterialSkipToLastPointElement.checked = youtubeHelper.getPipedMaterialSkipToLastPoint(); + pipedMaterialSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors'); + pipedMaterialSelectedSkipIntroElement.checked = selectSkip.includes('intro'); + pipedMaterialSelectedSkipOutroElement.checked = selectSkip.includes('outro'); + pipedMaterialSelectedSkipPreviewElement.checked = selectSkip.includes('preview'); + pipedMaterialSelectedSkipInteractionElement.checked = selectSkip.includes('interaction'); + pipedMaterialSelectedSkipSelfpromoElement.checked = selectSkip.includes('selfpromo'); + pipedMaterialSelectedSkipMusicOfftopicElement.checked = selectSkip.includes('music_offtopic'); + pipedMaterialSelectedSkipPoiHighlightElement.checked = selectSkip.includes('poi_highlight'); + pipedMaterialSelectedSkipFillerElement.checked = selectSkip.includes('filler'); commonHelper.processDefaultCustomInstances( 'piped', diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 61350fc0..a88f9581 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -165,7 +165,7 @@

Autoplay Video

- +
@@ -767,7 +767,7 @@

Skip Sponsors

- +
@@ -1134,6 +1134,80 @@

+
+
+

Audio Only

+ +
+ +
+

Disable LBRY

+ +
+ +
+

Proxy LBRY videos

+ +
+ +
+

Enable Sponsorblock

+ +
+ +
+

Skip to the last watched point when encountering a video already seen

+ +
+ +
+

Skip Sponsors

+ +
+ +
+

Skip Intermission/Intro Animation

+ +
+ +
+

Skip Endcards/Credits

+ +
+ +
+

Skip Preview/Recap

+ +
+ +
+

Skip Interaction Reminder (Subscribe)

+ +
+ +
+

Skip Unpaid/Self Promotion

+ +
+ +
+

Skip Music: Non-Music Section

+ +
+ +
+

Skip Highlight

+ +
+ +
+

Skip Filler Tangent

+ +
+
+ +
+

Default Instances

diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js index e3b8c5e7..c6e6fb52 100644 --- a/src/pages/options/youtube/youtube.js +++ b/src/pages/options/youtube/youtube.js @@ -9,10 +9,8 @@ let freetubeYatteeDivElement = document.getElementById("freetube-yatte"); let customSettingsDivElement = document.getElementsByClassName("custom-settings"); function changeFrontendsSettings() { - console.log('changeFrontendsSettings()'); let frontend = youtubeFrontendElement.value; - console.log("customSettingsDivElement", customSettingsDivElement[0].style.display); if (enableYoutubeCustomSettingsElement.checked) for (const item of customSettingsDivElement) item.style.display = 'block'; else @@ -106,7 +104,7 @@ volumeElement.addEventListener("input", } ); -let autoplayElement = document.getElementById("invidious-autoplay"); +let autoplayElement = document.getElementById("invidious-youtubeAutoplay"); autoplayElement.addEventListener("change", event => youtubeHelper.setAutoplay(event.target.checked) ); @@ -169,7 +167,7 @@ youtubeHelper.init().then(() => { volumeValueElement.textContent = `${youtubeHelper.getVolume()}%`; OnlyEmbeddedVideoElement.value = youtubeHelper.getOnlyEmbeddedVideo(); bypassWatchOnYoutubeElement.checked = youtubeHelper.getBypassWatchOnYoutube(); - autoplayElement.value = youtubeHelper.getAutoplay(); + autoplayElement.checked = youtubeHelper.getAutoplay(); let frontend = youtubeHelper.getFrontend(); youtubeFrontendElement.value = frontend; changeFrontendsSettings(); -- cgit 1.4.1