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

This commit is contained in:
Ajay Ramachandran
2019-08-31 17:13:59 -04:00

View File

@@ -90,20 +90,20 @@ chrome.runtime.onMessage.addListener(messageListener);
function messageListener(request, sender, sendResponse) { function messageListener(request, sender, sendResponse) {
//messages from popup script //messages from popup script
switch(request.message){
if (request.message == "update") { case "update":
videoIDChange(getYouTubeVideoID(document.URL)); videoIDChange(getYouTubeVideoID(document.URL));
}
if (request.message == "sponsorStart") { break;
case "sponsorStart":
sponsorMessageStarted(sendResponse); sponsorMessageStarted(sendResponse);
}
if (request.message == "sponsorDataChanged") { break;
case "sponsorDataChanged":
updateSponsorTimesSubmitting(); updateSponsorTimesSubmitting();
}
if (request.message == "isInfoFound") { break;
case "isInfoFound":
//send the sponsor times along with if it's found //send the sponsor times along with if it's found
sendResponse({ sendResponse({
found: sponsorDataFound, found: sponsorDataFound,
@@ -118,71 +118,76 @@ function messageListener(request, sender, sendResponse) {
} }
popupInitialised = true; popupInitialised = true;
} break;
case "getVideoID":
if (request.message == "getVideoID") {
sendResponse({ sendResponse({
videoID: sponsorVideoID videoID: sponsorVideoID
}) });
}
if (request.message == "getVideoDuration") { break;
case "getVideoDuration":
sendResponse({ sendResponse({
duration: v.duration duration: v.duration
}); });
}
if (request.message == "skipToTime") { break;
case "skipToTime":
v.currentTime = request.time; v.currentTime = request.time;
} return
case "getCurrentTime":
if (request.message == "getCurrentTime") {
sendResponse({ sendResponse({
currentTime: v.currentTime currentTime: v.currentTime
}); });
}
if (request.message == "getChannelURL") { break;
case "getChannelURL":
sendResponse({ sendResponse({
channelURL: channelURL channelURL: channelURL
}) });
}
if (request.message == "isChannelWhitelisted") { break;
case "isChannelWhitelisted":
sendResponse({ sendResponse({
value: channelWhitelisted value: channelWhitelisted
}) });
}
if (request.message == "whitelistChange") { break;
case "whitelistChange":
channelWhitelisted = request.value; channelWhitelisted = request.value;
sponsorsLookup(sponsorVideoID); sponsorsLookup(sponsorVideoID);
}
if (request.message == "showNoticeAgain") { break;
case "dontShowNotice":
dontShowNotice = false; dontShowNotice = false;
}
if (request.message == "changeStartSponsorButton") { break;
case "changeStartSponsorButton":
changeStartSponsorButton(request.showStartSponsor, request.uploadButtonVisible); changeStartSponsorButton(request.showStartSponsor, request.uploadButtonVisible);
}
if (request.message == "changeVideoPlayerControlsVisibility") { break;
case "showNoticeAgain":
dontShowNotice = false;
break;
case "changeVideoPlayerControlsVisibility":
hideVideoPlayerControls = request.value; hideVideoPlayerControls = request.value;
updateVisibilityOfPlayerControlsButton(); updateVisibilityOfPlayerControlsButton();
} else if (request.message == "changeInfoButtonPlayerControlsVisibility") {
break;
case "changeInfoButtonPlayerControlsVisibility":
hideInfoButtonPlayerControls = request.value; hideInfoButtonPlayerControls = request.value;
updateVisibilityOfPlayerControlsButton(); updateVisibilityOfPlayerControlsButton();
} else if (request.message == "changeDeleteButtonPlayerControlsVisibility") {
break;
case "changeDeleteButtonPlayerControlsVisibility":
hideDeleteButtonPlayerControls = request.value; hideDeleteButtonPlayerControls = request.value;
updateVisibilityOfPlayerControlsButton(); updateVisibilityOfPlayerControlsButton();
}
if (request.message == "trackViewCount") { break;
case "trackViewCount":
trackViewCount = request.value; trackViewCount = request.value;
break;
} }
} }