Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-11 14:07:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix UI issues with embeds

Browse Source 
- add loadStart trigger to create & update preview and buttons
- show info button on /embed/ but not /channel/
This commit is contained in:
Michael C
2021-12-31 22:56:46 -05:00
parent 7a7b21cd87
commit 44bc8741ef
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/content.ts
View File

@@ -399,6 +399,16 @@ function durationChangeListener(): void {
updatePreviewBar(); updatePreviewBar();
} }
/**
* Triggered once the video is ready.
* This is mainly to attach to embedded players who don't have a video element visible.
*/
function videoOnReadyListener(): void {
createPreviewBar();
updatePreviewBar();
createButtons();
}
function cancelSponsorSchedule(): void { function cancelSponsorSchedule(): void {
if (currentSkipSchedule !== null) { if (currentSkipSchedule !== null) {
clearTimeout(currentSkipSchedule); clearTimeout(currentSkipSchedule);
@@ -564,6 +574,7 @@ function refreshVideoAttachments() {
function setupVideoListeners() { function setupVideoListeners() {
//wait until it is loaded //wait until it is loaded
video.addEventListener('loadstart', videoOnReadyListener)
video.addEventListener('durationchange', durationChangeListener); video.addEventListener('durationchange', durationChangeListener);
if (!Config.config.disableSkipping) { if (!Config.config.disableSkipping) {
@@ -905,17 +916,19 @@ function getYouTubeVideoID(document: Document): string | boolean {
const url = document.URL; const url = document.URL;
// skip to URL if matches youtube watch or invidious or matches youtube pattern // skip to URL if matches youtube watch or invidious or matches youtube pattern
if ((!url.includes("youtube.com")) || url.includes("/watch") || url.includes("/shorts/") || url.includes("playlist")) return getYouTubeVideoIDFromURL(url); if ((!url.includes("youtube.com")) || url.includes("/watch") || url.includes("/shorts/") || url.includes("playlist")) return getYouTubeVideoIDFromURL(url);
// skip to document and don't hide if on /embed/
if (url.includes("/embed/")) return getYouTubeVideoIDFromDocument(document, false);
// skip to document if matches pattern // skip to document if matches pattern
if (url.includes("/channel/") || url.includes("/user/") || url.includes("/c/") || url.includes("/embed/")) return getYouTubeVideoIDFromDocument(document); if (url.includes("/channel/") || url.includes("/user/") || url.includes("/c/")) return getYouTubeVideoIDFromDocument(document);
// not sure, try URL then document // not sure, try URL then document
return getYouTubeVideoIDFromURL(url) || getYouTubeVideoIDFromDocument(document); return getYouTubeVideoIDFromURL(url) || getYouTubeVideoIDFromDocument(document);
} }
function getYouTubeVideoIDFromDocument(document: Document): string | boolean { function getYouTubeVideoIDFromDocument(document: Document, hideIcon = true): string | boolean {
// get ID from document (channel trailer / embedded playlist) // get ID from document (channel trailer / embedded playlist)
const videoURL = document.querySelector("[data-sessionlink='feature=player-title']")?.getAttribute("href"); const videoURL = document.querySelector("[data-sessionlink='feature=player-title']")?.getAttribute("href");
if (videoURL) { if (videoURL) {
onInvidious = true; onInvidious = hideIcon;
return getYouTubeVideoIDFromURL(videoURL); return getYouTubeVideoIDFromURL(videoURL);
} else { } else {
return false return false