From 88f60c0e84394dbf8516f9fc7ca46542c698a532 Mon Sep 17 00:00:00 2001 From: Michael C Date: Fri, 8 Apr 2022 22:03:00 -0400 Subject: [PATCH 1/2] close #1265 --- src/content.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content.ts b/src/content.ts index 2212945b..49c57372 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1003,10 +1003,10 @@ function getYouTubeVideoID(document: Document): string | boolean { const url = document.URL; // clips should never skip, going from clip to full video has no indications. if (url.includes("youtube.com/clip/")) return false; + // skip to document and don't hide if on /embed/ + if (url.includes("/embed/") && url.includes("youtube.com")) return getYouTubeVideoIDFromDocument(document, false); // 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); - // skip to document and don't hide if on /embed/ - if (url.includes("/embed/")) return getYouTubeVideoIDFromDocument(document, false); // skip to document if matches pattern if (url.includes("/channel/") || url.includes("/user/") || url.includes("/c/")) return getYouTubeVideoIDFromDocument(document); // not sure, try URL then document From 0d34e643c7a939d6326a4c49ce753b05b581abc1 Mon Sep 17 00:00:00 2001 From: Michael C Date: Fri, 8 Apr 2022 22:36:44 -0400 Subject: [PATCH 2/2] fix #1236 --- public/content.css | 6 ++++++ src/content.ts | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/content.css b/public/content.css index f697300e..afcd4c3d 100644 --- a/public/content.css +++ b/public/content.css @@ -652,4 +652,10 @@ input::-webkit-inner-spin-button { .sponsorBlockCategoryPill:hover .categoryPillClose { display: inherit; +} + +/* tweak for mobile duration */ +#sponsorBlockDurationAfterSkips.ytm-time-display { + padding-left: 4px; + margin: 0px; } \ No newline at end of file diff --git a/src/content.ts b/src/content.ts index 49c57372..2ebfc38e 100644 --- a/src/content.ts +++ b/src/content.ts @@ -2126,14 +2126,15 @@ function updateAdFlag(): void { } function showTimeWithoutSkips(skippedDuration: number): void { - if (onMobileYouTube || onInvidious) return; + if (onInvidious) return; if (isNaN(skippedDuration) || skippedDuration < 0) { skippedDuration = 0; } // YouTube player time display - const display = document.querySelector(".ytp-time-display.notranslate"); + const displayClass = onMobileYouTube ? "ytm-time-display" : "ytp-time-display.notranslate" + const display = document.querySelector(`.${displayClass}`); if (!display) return; const durationID = "sponsorBlockDurationAfterSkips"; @@ -2143,7 +2144,7 @@ function showTimeWithoutSkips(skippedDuration: number): void { if (duration === null) { duration = document.createElement('span'); duration.id = durationID; - duration.classList.add("ytp-time-duration"); + duration.classList.add(displayClass); display.appendChild(duration); }