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

fix #1496

Browse Source 
- force return bad videoID on clip
- don't createbuttons on video ready, updateVisibility with more checks
- don't switch to falsy videoIDs if already available
This commit is contained in:
Michael C
2022-09-27 00:59:24 -04:00
parent 3337fa04b9
commit 8f7408d815
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/content.ts
View File

@@ -383,6 +383,8 @@ function resetValues() {
} }
async function videoIDChange(id): Promise<void> { async function videoIDChange(id): Promise<void> {
// don't switch to invalid value
if (!id && sponsorVideoID) return;
//if the id has not changed return unless the video element has changed //if the id has not changed return unless the video element has changed
if (sponsorVideoID === id && (isVisible(video) || !video)) return; if (sponsorVideoID === id && (isVisible(video) || !video)) return;
@@ -532,7 +534,7 @@ function durationChangeListener(): void {
function videoOnReadyListener(): void { function videoOnReadyListener(): void {
createPreviewBar(); createPreviewBar();
updatePreviewBar(); updatePreviewBar();
createButtons(); updateVisibilityOfPlayerControlsButton()
} }
function cancelSponsorSchedule(): void { function cancelSponsorSchedule(): void {
@@ -1218,7 +1220,7 @@ function getYouTubeVideoID(document: Document, url?: string): string | boolean {
// pageType shortcut // pageType shortcut
if (pageType === PageType.Channel) return getYouTubeVideoIDFromDocument() if (pageType === PageType.Channel) return getYouTubeVideoIDFromDocument()
// clips should never skip, going from clip to full video has no indications. // clips should never skip, going from clip to full video has no indications.
if (url.includes("youtube.com/clip/")) return false; if (url.includes("youtube.com/clip/")) return "clipNoID";
// skip to document and don't hide if on /embed/ // skip to document and don't hide if on /embed/
if (url.includes("/embed/") && url.includes("youtube.com")) return getYouTubeVideoIDFromDocument(false); if (url.includes("/embed/") && url.includes("youtube.com")) return getYouTubeVideoIDFromDocument(false);
// 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
@@ -1756,16 +1758,14 @@ function shouldSkip(segment: SponsorTime): boolean {
/** Creates any missing buttons on the YouTube player if possible. */ /** Creates any missing buttons on the YouTube player if possible. */
async function createButtons(): Promise<void> { async function createButtons(): Promise<void> {
if (onMobileYouTube) return;
controls = await utils.wait(getControls).catch(); controls = await utils.wait(getControls).catch();
// Add button if does not already exist in html // Add button if does not already exist in html
createButton("startSegment", "sponsorStart", () => startOrEndTimingNewSegment(), "PlayerStartIconSponsorBlocker.svg"); createButton("startSegment", "sponsorStart", () => startOrEndTimingNewSegment(), "PlayerStartIconSponsorBlocker.svg");
createButton("cancelSegment", "sponsorCancel", () => cancelCreatingSegment(), "PlayerCancelSegmentIconSponsorBlocker.svg"); createButton("cancelSegment", "sponsorCancel", () => cancelCreatingSegment(), "PlayerCancelSegmentIconSponsorBlocker.svg");
createButton("delete", "clearTimes", () => clearSponsorTimes(), "PlayerDeleteIconSponsorBlocker.svg"); createButton("delete", "clearTimes", () => clearSponsorTimes(), "PlayerDeleteIconSponsorBlocker.svg");
createButton("submit", "SubmitTimes", submitSponsorTimes, "PlayerUploadIconSponsorBlocker.svg"); createButton("submit", "SubmitTimes", () => submitSponsorTimes(), "PlayerUploadIconSponsorBlocker.svg");
createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker.svg"); createButton("info", "openPopup", () => openInfoMenu(), "PlayerInfoIconSponsorBlocker.svg");
const controlsContainer = getControls(); const controlsContainer = getControls();
if (Config.config.autoHideInfoButton && !onInvidious && controlsContainer if (Config.config.autoHideInfoButton && !onInvidious && controlsContainer