external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-09-20 04:53:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed double sponsor skip for zero second sponsors

Browse source
This commit is contained in:
Ajay Ramachandran 2020-03-08 23:16:09 -04:00
parent 0241e15691
commit a484f2f2cc
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/content.ts
View file

@ -44,8 +44,8 @@ var lastPreviewBarUpdate;
//whether the duration listener listening for the duration changes of the video has been setup yet
var durationListenerSetUp = false;
// Has a zero second sponsor been skipped yet
var skippedZeroSecond = false;
// Is the video currently being switched
var switchingVideos = false;
//the channel this video is about
var channelURL;
@ -250,8 +250,6 @@ function resetValues() {
//reset sponsor data found check
sponsorDataFound = false;
skippedZeroSecond = false;
}
async function videoIDChange(id) {
@ -266,6 +264,8 @@ async function videoIDChange(id) {
//id is not valid
if (!id) return;
switchingVideos = true;
// Wait for options to be ready
await utils.wait(() => Config.config !== null, 5000, 1);
@ -460,8 +460,6 @@ function startSponsorSchedule(currentTime?: number): void {
let skippingFunction = () => {
if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
if (currentTime == 0) skippedZeroSecond = true;
skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
}
@ -493,9 +491,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
if (!seekListenerSetUp && !Config.config.disableSkipping) {
seekListenerSetUp = true;
video.addEventListener('play', () => startSponsorSchedule());
video.addEventListener('play', () => {
switchingVideos = false;
startSponsorSchedule();
});
video.addEventListener('seeked', () => {
if (!video.paused) startSponsorSchedule()
if (!video.paused) startSponsorSchedule();
});
video.addEventListener('ratechange', () => startSponsorSchedule());
video.addEventListener('seeking', cancelSponsorSchedule);
@ -571,10 +572,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
}
}
if (zeroSecondSponsor && !skippedZeroSecond) {
startSponsorSchedule(0);
} else {
startSponsorSchedule();
if (!video.paused && !switchingVideos) {
if (zeroSecondSponsor) {
startSponsorSchedule(0);
} else {
startSponsorSchedule();
}
}
// Reset skip save