Fix refresh on popup never ends when not on bilibili

hanydd · Feb 28, 2024 · 6413c35 · 6413c35
1 parent a980c55
commit 6413c35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/content.ts b/src/content.ts
@@ -248,7 +248,14 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             break;
         case "refreshSegments":
             // update video on refresh if videoID invalid
-            if (!getVideoID()) checkVideoIDChange();
+            if (!getVideoID()) {
+                checkVideoIDChange().then(() => {
+                    if (!getVideoID()) {
+                        // if not on a video page, send a message to the popup to stop refresh animation
+                        chrome.runtime.sendMessage({ message: "infoUpdated" });
+                    }
+                });
+            }
             // fetch segments
             sponsorsLookup(false);
 

diff --git a/src/popup.ts b/src/popup.ts
@@ -447,8 +447,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
             return;
         }
 
-        //if request is undefined, then the page currently being browsed is not Bilibili
-        if (request != undefined) {
+        // if request is undefined, then the page currently being browsed is not Bilibili
+        if (request.found != undefined) {
             //remove loading text
             PageElements.mainControls.style.display = "block";
             PageElements.whitelistButton.classList.remove("hidden");
@@ -471,6 +471,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
 
                 PageElements.issueReporterImportExport.classList.remove("hidden");
             }
+        } else {
+            displayNoVideo();
         }
 
         //see if whitelist button should be swapped