Fixed skip notice references fixing manual skip notices.

3 files changed, 18 insertions, 18 deletions

diff --git a/src/background.ts b/src/background.ts
index 967f221a..92e1ee50 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -42,8 +42,8 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
         case "getSponsorTimes":
             getSponsorTimes(request.videoID, function(sponsorTimes) {
                 callback({
-                    sponsorTimes: sponsorTimes
-                })
+                    sponsorTimes
+                });
             });
         
             //this allows the callback to be called later
diff --git a/src/content.ts b/src/content.ts
index 1d035630..79ef2da1 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -76,7 +76,7 @@ var sponsorTimesSubmitting = [];
 var popupInitialised = false;
 
 // Contains all of the functions and variables needed by the skip notice
-var skipNoticeContentContainer = {
+var skipNoticeContentContainer = () => ({
     vote,
     dontShowNoticeAgain,
     unskipSponsorTime,
@@ -86,7 +86,7 @@ var skipNoticeContentContainer = {
     reskipSponsorTime,
     hiddenSponsorTimes,
     updatePreviewBar
-};
+});
 
 //get messages from the background script and the popup
 chrome.runtime.onMessage.addListener(messageListener);
@@ -573,12 +573,12 @@ function sponsorCheck() {
     }
 
     //don't keep track until they are loaded in
-    if (sponsorTimes != null || sponsorTimesSubmitting.length > 0) {
+    if (sponsorTimes !== null || sponsorTimesSubmitting.length > 0) {
         lastTime = v.currentTime;
     }
 }
 
-function checkSponsorTime(sponsorTimes, index, openNotice) {
+function checkSponsorTime(sponsorTimes, index, openNotice): boolean {
     //this means part of the video was just skipped
     if (Math.abs(v.currentTime - lastTime) > 1 && lastTime != -1) {
         //make lastTime as if the video was playing normally
diff --git a/src/js-components/skipNotice.ts b/src/js-components/skipNotice.ts
index fd675d6e..b3e9c944 100644
--- a/src/js-components/skipNotice.ts
+++ b/src/js-components/skipNotice.ts
@@ -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;
             }
         }