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

Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into mbledkowski

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-10-14 23:09:26 -04:00
parent afa4cfa2c6 4dc4160215
commit 31d4c621d1
25 changed files with 218 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/SkipNoticeComponent.tsx
View File

@@ -78,7 +78,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
: "category_" + this.segments[0].category + "_short") || chrome.i18n.getMessage("category_" + this.segments[0].category);
let noticeTitle = categoryName + " " + chrome.i18n.getMessage("skipped");
if (!this.autoSkip) {
noticeTitle = chrome.i18n.getMessage("skip") + " " + categoryName + "?";
noticeTitle = chrome.i18n.getMessage("skip_category").replace("{0}", categoryName);
}
//add notice
@@ -540,4 +540,4 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
}
}
export default SkipNoticeComponent;
export default SkipNoticeComponent;

8
src/content.ts
View File

@@ -1007,7 +1007,13 @@ function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: S
let autoSkip: boolean = utils.getCategorySelection(skippingSegments[0].category)?.option === CategorySkipOption.AutoSkip;
if ((autoSkip || sponsorTimesSubmitting.includes(skippingSegments[0])) && v.currentTime !== skipTime[1]) {
v.currentTime = skipTime[1];
// Fix for looped videos not working when skipping to the end #426
// for some reason you also can't skip to 1 second before the end
if (v.loop && v.duration > 1 && skipTime[1] >= v.duration - 1) {
v.currentTime = 0;
} else {
v.currentTime = skipTime[1];
}
}
if (openNotice) {