Closes #948

ParticleCore · Mar 1, 2024 · e705969 · e705969
1 parent 0abb930
commit e705969
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/src/chrome/js/background-inject.js b/src/chrome/js/background-inject.js
@@ -916,6 +916,40 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
         };
 
+        const preventScrollTop = (() => {
+
+            let original = null;
+
+            const override = () => {
+
+                const watchFlexy = document.querySelector("ytd-watch-flexy");
+
+                if (watchFlexy) {
+                    original = watchFlexy.setScrollTop;
+                    watchFlexy.setScrollTop = () => {
+                    };
+                }
+
+            };
+
+            const restore = () => {
+
+                const watchFlexy = document.querySelector("ytd-watch-flexy");
+
+                if (watchFlexy) {
+                    watchFlexy.setScrollTop = original;
+                    original = null;
+                }
+
+            };
+
+            return {
+                override: override,
+                restore: restore
+            }
+
+        })();
+
         const updateState = event => {
 
             moviePlayer ??= document.getElementById("movie_player");
@@ -939,13 +973,15 @@ function mainScript(extensionId, SettingData, defaultSettings) {
                 && parentRects.bottom < parentRects.height * .5
             ) {
                 if (!isAlwaysVisible()) {
+                    preventScrollTop.override();
                     document.documentElement.setAttribute("always-visible-player", "");
                     window.addEventListener("mousedown", onMouseDown, true);
                     window.addEventListener("contextmenu", onContextMenu, true);
                     updatePosition();
                     window.dispatchEvent(new CustomEvent("resize"));
                 }
             } else if (isAlwaysVisible()) {
+                preventScrollTop.restore();
                 document.documentElement.removeAttribute("always-visible-player");
                 window.removeEventListener("mousedown", onMouseDown, true);
                 window.removeEventListener("contextmenu", onContextMenu, true);

diff --git a/src/firefox/js/background-inject.js b/src/firefox/js/background-inject.js
@@ -916,6 +916,40 @@ function mainScript(extensionId, SettingData, defaultSettings) {
 
         };
 
+        const preventScrollTop = (() => {
+
+            let original = null;
+
+            const override = () => {
+
+                const watchFlexy = document.querySelector("ytd-watch-flexy");
+
+                if (watchFlexy) {
+                    original = watchFlexy.setScrollTop;
+                    watchFlexy.setScrollTop = () => {
+                    };
+                }
+
+            };
+
+            const restore = () => {
+
+                const watchFlexy = document.querySelector("ytd-watch-flexy");
+
+                if (watchFlexy) {
+                    watchFlexy.setScrollTop = original;
+                    original = null;
+                }
+
+            };
+
+            return {
+                override: override,
+                restore: restore
+            }
+
+        })();
+
         const updateState = event => {
 
             moviePlayer ??= document.getElementById("movie_player");
@@ -939,13 +973,15 @@ function mainScript(extensionId, SettingData, defaultSettings) {
                 && parentRects.bottom < parentRects.height * .5
             ) {
                 if (!isAlwaysVisible()) {
+                    preventScrollTop.override();
                     document.documentElement.setAttribute("always-visible-player", "");
                     window.addEventListener("mousedown", onMouseDown, true);
                     window.addEventListener("contextmenu", onContextMenu, true);
                     updatePosition();
                     window.dispatchEvent(new CustomEvent("resize"));
                 }
             } else if (isAlwaysVisible()) {
+                preventScrollTop.restore();
                 document.documentElement.removeAttribute("always-visible-player");
                 window.removeEventListener("mousedown", onMouseDown, true);
                 window.removeEventListener("contextmenu", onContextMenu, true);