Added better error checking

This commit is contained in:
Ajay Ramachandran
2019-08-12 12:02:01 -04:00
parent 5adeeed634
commit 43e3d03e9a

View File

@@ -208,22 +208,24 @@ function runThePopup() {
function onTabs(tabs) { function onTabs(tabs) {
chrome.tabs.sendMessage(tabs[0].id, {message: 'getVideoID'}, function(result) { chrome.tabs.sendMessage(tabs[0].id, {message: 'getVideoID'}, function(result) {
if (result.videoID) { if (result != undefined && result.videoID) {
loadTabData(tabs, result.videoid); loadTabData(tabs, result.videoID);
} } else if (result == undefined && chrome.runtime.lastError) {
//this isn't a YouTube video then, or at least the content script is not loaded
displayNoVideo();
}
}); });
} }
function loadTabData(tabs, currentVideoID) { function loadTabData(tabs, videoID) {
if (!videoID) {
if (!currentVideoID) {
//this isn't a YouTube video then //this isn't a YouTube video then
displayNoVideo(); displayNoVideo();
return; return;
} }
//load video times for this video //load video times for this video
let sponsorTimeKey = "sponsorTimes" + currentVideoID; let sponsorTimeKey = "sponsorTimes" + videoID;
chrome.storage.sync.get([sponsorTimeKey], function(result) { chrome.storage.sync.get([sponsorTimeKey], function(result) {
let sponsorTimesStorage = result[sponsorTimeKey]; let sponsorTimesStorage = result[sponsorTimeKey];
if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) { if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) {