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

Fixed skip notice references fixing manual skip notices.

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-02-04 00:05:03 -05:00
parent 13cef5ff14
commit 3582f45fd8
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/js-components/skipNotice.ts
View File

@@ -8,7 +8,7 @@ class SkipNotice {
UUID: string;
manualSkip: boolean;
// Contains functions and variables from the content script needed by the skip notice
contentContainer: any;
contentContainer: () => any;
maxCountdownTime: () => number;
countdownTime: any;
@@ -128,7 +128,7 @@ class SkipNotice {
downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + this.idSuffix;
downvoteButton.className = "sponsorSkipObject voteButton";
downvoteButton.src = chrome.extension.getURL("icons/report.png");
downvoteButton.addEventListener("click", () => this.contentContainer.vote(0, this.UUID, this));
downvoteButton.addEventListener("click", () => this.contentContainer().vote(0, this.UUID, this));
downvoteButton.setAttribute("title", chrome.i18n.getMessage("reportButtonInfo"));
//add downvote and report text to container
@@ -156,7 +156,7 @@ class SkipNotice {
let dontShowAgainButton = document.createElement("button");
dontShowAgainButton.innerText = chrome.i18n.getMessage("Hide");
dontShowAgainButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton";
dontShowAgainButton.addEventListener("click", this.contentContainer.dontShowNoticeAgain);
dontShowAgainButton.addEventListener("click", this.contentContainer().dontShowNoticeAgain);
// Don't let them hide it if manually skipping
if (!this.manualSkip) {
@@ -255,7 +255,7 @@ class SkipNotice {
}
unskip() {
this.contentContainer.unskipSponsorTime(this.UUID);
this.contentContainer().unskipSponsorTime(this.UUID);
this.unskippedMode(chrome.i18n.getMessage("reskip"));
}
@@ -271,8 +271,8 @@ class SkipNotice {
//change max duration to however much of the sponsor is left
this.maxCountdownTime = function() {
let sponsorTime = this.contentContainer.sponsorTimes[this.contentContainer.UUIDs.indexOf(this.UUID)];
let duration = Math.round(sponsorTime[1] - this.contentContainer.v.currentTime);
let sponsorTime = this.contentContainer().sponsorTimes[this.contentContainer().UUIDs.indexOf(this.UUID)];
let duration = Math.round(sponsorTime[1] - this.contentContainer().v.currentTime);
return Math.max(duration, 4);
};
@@ -282,7 +282,7 @@ class SkipNotice {
}
reskip() {
this.contentContainer.reskipSponsorTime(this.UUID);
this.contentContainer().reskipSponsorTime(this.UUID);
//change reskip button to a unskip button
let unskipButton = this.changeUnskipButton(chrome.i18n.getMessage("unskip"));
@@ -300,7 +300,7 @@ class SkipNotice {
if (this.manualSkip) {
this.changeNoticeTitle(chrome.i18n.getMessage("noticeTitle"));
this.contentContainer.vote(1, this.UUID, this);
this.contentContainer().vote(1, this.UUID, this);
}
}
@@ -324,14 +324,14 @@ class SkipNotice {
//remove this sponsor from the sponsors looked up
//find which one it is
for (let i = 0; i < this.contentContainer.sponsorTimes.length; i++) {
if (this.contentContainer.UUIDs[i] == this.UUID) {
for (let i = 0; i < this.contentContainer().sponsorTimes.length; i++) {
if (this.contentContainer().UUIDs[i] == this.UUID) {
//this one is the one to hide
//add this as a hidden sponsorTime
this.contentContainer.hiddenSponsorTimes.push(i);
this.contentContainer().hiddenSponsorTimes.push(i);
this.contentContainer.updatePreviewBar();
this.contentContainer().updatePreviewBar();
break;
}
}