Fix #87

Andrews54757 · Feb 22, 2024 · c2bc544 · c2bc544
1 parent 0f368a9
commit c2bc544
Showing 1 changed file with 60 additions and 18 deletions.
diff --git a/chrome/content.js b/chrome/content.js
@@ -212,24 +212,7 @@ chrome.runtime.onMessage.addListener(
         OverridenYTKeys = true;
         return true;
       } else if (request.type === 'remove_players') {
-        iframeMap.forEach((iframeObj) => {
-          unmakeMiniPlayer(iframeObj);
-        });
-
-        players.forEach((player) => {
-          if (player.isYt) {
-            showYT(player.old);
-            player.iframe.parentNode.removeChild(player.iframe);
-          } else {
-            player.iframe.parentNode.replaceChild(player.old, player.iframe);
-          }
-
-          removePauseListeners(player.old);
-        });
-
-        players.length = 0;
-        FoundYTPlayer = null;
-        OverridenYTKeys = false;
+        removePlayers();
         sendResponse('ok');
       } else if (request.type === 'get_video_size') {
         getVideo().then((video) => {
@@ -239,6 +222,27 @@ chrome.runtime.onMessage.addListener(
       }
     });
 
+function removePlayers() {
+  iframeMap.forEach((iframeObj) => {
+    unmakeMiniPlayer(iframeObj);
+  });
+
+  players.forEach((player) => {
+    if (player.isYt) {
+      showYT(player.old);
+      player.iframe.parentNode.removeChild(player.iframe);
+    } else {
+      player.iframe.parentNode.replaceChild(player.old, player.iframe);
+    }
+
+    removePauseListeners(player.old);
+  });
+
+  players.length = 0;
+  FoundYTPlayer = null;
+  OverridenYTKeys = false;
+}
+
 function updateMiniPlayer(iframeObj) {
   if (iframeObj.isMini) {
     const element = iframeObj.placeholder;
@@ -797,6 +801,24 @@ function get_yt_video_elements() {
   return elements;
 }
 
+function isLinkToDifferentPageOnWebsite(url) {
+  try {
+    url = new URL(url, window.location.href);
+  } catch (e) {
+    return false;
+  }
+
+  if (url.origin !== window.location.origin) {
+    return false;
+  }
+
+  if (url.pathname !== window.location.pathname) {
+    return true;
+  }
+
+  return false;
+}
+
 function getKeyString(e) {
   const metaPressed = e.metaKey && e.key !== 'Meta';
   const ctrlPressed = e.ctrlKey && e.key !== 'Control';
@@ -892,5 +914,25 @@ if (is_url_yt(window.location.href)) {
       e.stopImmediatePropagation();
     }
   }, true);
+} else {
+  document.addEventListener('click', (e) => {
+    let current = e.target;
+    while (current) {
+      if (current.tagName === 'A') {
+        break;
+      }
+      current = current.parentElement;
+    }
+
+    if (!current || !current.href) {
+      return;
+    }
+
+    // check if href leads to different page and origin
+    const url = current.href;
+    if (isLinkToDifferentPageOnWebsite(url)) {
+      removePlayers();
+    }
+  }, true);
 }