From 493fb3fc7219131040a369e7bb1f46928192cb3c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 10 Jul 2019 11:55:09 -0400 Subject: Changed the way it detects when a page is not YouTube and prevented lastError. --- popup.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/popup.js b/popup.js index 3b6d337c..93f60182 100644 --- a/popup.js +++ b/popup.js @@ -25,14 +25,6 @@ chrome.storage.local.get(["dontShowNoticeAgain"], function(result) { } }); -//if no response comes by this point, give up -setTimeout(function() { - if (!isYouTubeTab) { - document.getElementById("loadingIndicator").innerHTML = "This probably isn't a YouTube tab, or you clicked too early. " + - "If you know this is a YouTube tab, close this popup and open it again."; - } -}, 100); - chrome.tabs.query({ active: true, currentWindow: true @@ -72,6 +64,13 @@ function loadTabData(tabs) { } function infoFound(request) { + if(chrome.runtime.lastError) { + //This page doesn't have the injected content script, or at least not yet + document.getElementById("loadingIndicator").innerHTML = "This probably isn't a YouTube tab, or you clicked too early. " + + "If you know this is a YouTube tab, close this popup and open it again."; + return; + } + //if request is undefined, then the page currently being browsed is not YouTube if (request != undefined) { //this must be a YouTube video -- cgit v1.2.3