Fix autoplay control not working correctly when resizing page and nav…

…igating Fix issue when trying to move chat location
ParticleCore · Mar 6, 2024 · b9ef588 · b9ef588
1 parent 8a8109d
commit b9ef588
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/src/chrome/css/content-script.css b/src/chrome/css/content-script.css
@@ -1,5 +1,5 @@
 /* ini | autoplay */
-#movie_player.unstarted-mode > *:not(.ytp-cued-thumbnail-overlay) {
+#movie_player.unstarted-mode:is(.playing-mode, .paused-mode) > *:not(.ytp-cued-thumbnail-overlay) {
     display: none;
 }
 /* end | autoplay */

diff --git a/src/chrome/js/background-inject.js b/src/chrome/js/background-inject.js
@@ -294,10 +294,9 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
             if (canPlay) {
                 previousVideoId = document.getElementById("movie_player")?.["getVideoData"]()?.["video_id"] || null;
+                timer = setTimeout(() => canPlay = false, 300);
             }
 
-            timer = setTimeout(() => canPlay = false, 300);
-
         }
 
         const override = () => {
@@ -346,12 +345,22 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
         };
 
+        const onNavigate = () => {
+            clearTimeout(timer);
+            canPlay = false;
+            previousVideoId = null;
+        };
+
         const update = () => {
             if (iridiumSettings.autoplay) {
                 document.documentElement.removeEventListener("click", onClick, true);
+                window.removeEventListener("yt-navigate-start", onNavigate, false);
+                window.removeEventListener("popstate", onNavigate, true);
                 reset();
             } else {
                 document.documentElement.addEventListener("click", onClick, true);
+                window.addEventListener("yt-navigate-start", onNavigate, false);
+                window.addEventListener("popstate", onNavigate, true);
                 override();
             }
         };
@@ -678,7 +687,7 @@ function mainScript(extensionId, SettingData, defaultSettings) {
             }
 
             const url = browseEndpoint["canonicalBaseUrl"]
-                || (browseEndpoint["browseId"] ? `/channel/${browseEndpoint["browseId"]}` : undefined) ;
+                || (browseEndpoint["browseId"] ? `/channel/${browseEndpoint["browseId"]}` : undefined);
 
             if (url) {
                 metadata.url = link.href = `${url}/${iridiumSettings.channelTab}`;
@@ -798,7 +807,7 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
                         const donationShelf = document.getElementById("donation-shelf");
 
-                        if (donationShelf) {
+                        if (donationShelf && sidebar === donationShelf.parentElement) {
                             sidebar.insertBefore(chat, donationShelf);
                         } else {
                             sidebar.prepend(chat);

diff --git a/src/firefox/css/content-script.css b/src/firefox/css/content-script.css
@@ -1,5 +1,5 @@
 /* ini | autoplay */
-#movie_player.unstarted-mode > *:not(.ytp-cued-thumbnail-overlay) {
+#movie_player.unstarted-mode:is(.playing-mode, .paused-mode) > *:not(.ytp-cued-thumbnail-overlay) {
     display: none;
 }
 /* end | autoplay */

diff --git a/src/firefox/js/background-inject.js b/src/firefox/js/background-inject.js
@@ -294,10 +294,9 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
             if (canPlay) {
                 previousVideoId = document.getElementById("movie_player")?.["getVideoData"]()?.["video_id"] || null;
+                timer = setTimeout(() => canPlay = false, 300);
             }
 
-            timer = setTimeout(() => canPlay = false, 300);
-
         }
 
         const override = () => {
@@ -346,12 +345,22 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
         };
 
+        const onNavigate = () => {
+            clearTimeout(timer);
+            canPlay = false;
+            previousVideoId = null;
+        };
+
         const update = () => {
             if (iridiumSettings.autoplay) {
                 document.documentElement.removeEventListener("click", onClick, true);
+                window.removeEventListener("yt-navigate-start", onNavigate, false);
+                window.removeEventListener("popstate", onNavigate, true);
                 reset();
             } else {
                 document.documentElement.addEventListener("click", onClick, true);
+                window.addEventListener("yt-navigate-start", onNavigate, false);
+                window.addEventListener("popstate", onNavigate, true);
                 override();
             }
         };
@@ -678,7 +687,7 @@ function mainScript(extensionId, SettingData, defaultSettings) {
             }
 
             const url = browseEndpoint["canonicalBaseUrl"]
-                || (browseEndpoint["browseId"] ? `/channel/${browseEndpoint["browseId"]}` : undefined) ;
+                || (browseEndpoint["browseId"] ? `/channel/${browseEndpoint["browseId"]}` : undefined);
 
             if (url) {
                 metadata.url = link.href = `${url}/${iridiumSettings.channelTab}`;
@@ -798,7 +807,7 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
                         const donationShelf = document.getElementById("donation-shelf");
 
-                        if (donationShelf) {
+                        if (donationShelf && sidebar === donationShelf.parentElement) {
                             sidebar.insertBefore(chat, donationShelf);
                         } else {
                             sidebar.prepend(chat);