diff options
author | Ajay Ramachandran <[email protected]> | 2019-07-28 17:56:50 -0400 |
---|---|---|
committer | GitHub <[email protected]> | 2019-07-28 17:56:50 -0400 |
commit | ff9badf2e9bd246c7be87c980926d121b9446752 (patch) | |
tree | a6dfd80ce432f5af3a4efa89fdb2dede3b776475 | |
parent | b0090a3334f0cdd6f98e7c33e4076afdb668537c (diff) | |
parent | aefc880486cbb45af8deac702ab3583c6ac4ee8e (diff) | |
download | SponsorBlock-ff9badf2e9bd246c7be87c980926d121b9446752.tar.gz SponsorBlock-ff9badf2e9bd246c7be87c980926d121b9446752.zip |
Merge pull request #39 from ajayyy/experimentalv1.0.12
Fixed an issue on Firefox where the old video's sponsors would sometimes play on the next video
-rw-r--r-- | content.js | 31 | ||||
-rw-r--r-- | firefox_manifest.json | 2 | ||||
-rw-r--r-- | manifest.json | 2 |
3 files changed, 22 insertions, 13 deletions
@@ -1,13 +1,15 @@ -if(id = getYouTubeVideoID(document.URL)){ // Direct Links - videoIDChange(id); -} - //was sponsor data found when doing SponsorsLookup var sponsorDataFound = false; //the actual sponsorTimes if loaded and UUIDs associated with them -var sponsorTimes = undefined; -var UUIDs = undefined; +var sponsorTimes = null; +var UUIDs = null; +//what video id are these sponsors for +var sponsorVideoID = null; + +if(id = getYouTubeVideoID(document.URL)){ // Direct Links + videoIDChange(id); +} //the video var v; @@ -53,6 +55,7 @@ chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) { chrome.runtime.onMessage.addListener( // Detect URL Changes function(request, sender, sendResponse) { + console.log(request.message) //message from background script if (request.message == "ytvideoid") { videoIDChange(request.id); @@ -117,13 +120,19 @@ document.onkeydown = function(e){ } function videoIDChange(id) { + //not a url change + if (sponsorVideoID == id){ + return; + } + //reset last sponsor times lastTime = -1; lastUnixTimeSkipped = -1; //reset sponsor times - sponsorTimes = undefined; - UUIDs = undefined; + sponsorTimes = null; + UUIDs = null; + sponsorVideoID = id; //reset sponsor data found check sponsorDataFound = false; @@ -136,9 +145,9 @@ function videoIDChange(id) { }, function(response) { if (response != undefined) { let sponsorTimes = response.sponsorTimes; - if (sponsorTimes != undefined && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length >= 2) { + if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length >= 2) { document.getElementById("submitButton").style.display = "unset"; - } else if (sponsorTimes != undefined && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) { + } else if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) { toggleStartSponsorButton(); } } @@ -232,7 +241,7 @@ function sponsorCheck(sponsorTimes) { // Video skipping } function goBackToPreviousTime(UUID) { - if (sponsorTimes != undefined) { + if (sponsorTimes != null) { //add a tiny bit of time to make sure it is not skipped again v.currentTime = sponsorTimes[UUIDs.indexOf(UUID)][0] + 0.001; diff --git a/firefox_manifest.json b/firefox_manifest.json index 042acf13..4c2a0bad 100644 --- a/firefox_manifest.json +++ b/firefox_manifest.json @@ -1,7 +1,7 @@ { "name": "SponsorBlock - YouTube Sponsorship Blocker", "short_name": "SponsorBlock", - "version": "1.0.11", + "version": "1.0.12", "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.", "content_scripts": [ { diff --git a/manifest.json b/manifest.json index 4cadb2fe..2287e4d3 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "SponsorBlock - YouTube Sponsorship Blocker", "short_name": "SponsorBlock", - "version": "1.0.11", + "version": "1.0.12", "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.", "content_scripts": [ { |