refactor mutation observers

Araxeus · Aug 19, 2024 · 817ba14 · 817ba14
1 parent ff35b7d
commit 817ba14
Showing 1 changed file with 32 additions and 14 deletions.
diff --git a/unpacked/pageAccess.js b/unpacked/pageAccess.js
@@ -836,13 +836,22 @@ if (ytvs.$('#movie_player:not(.unstarted-mode) video')) {
     if (moviePlayer) {
         documentObserver.observe(moviePlayer, { attributes: true });
     } else {
-        setTimeout(() =>
-            documentObserver.observe(
-                ytvs.$('ytd-page-manager'),
-                { childList: true },
-                ytvs.$('ytd-page-manager') ? 0 : 200,
-            ),
-        );
+        const pageManager = ytvs.$('ytd-page-manager');
+        if (pageManager) {
+            documentObserver.observe(pageManager, { childList: true });
+        } else {
+            new MutationObserver((_, observer) => {
+                if (ytvs.$('ytd-page-manager')) {
+                    observer.disconnect();
+                    documentObserver.observe(ytvs.$('ytd-page-manager'), {
+                        childList: true,
+                    });
+                }
+            }).observe(document.documentElement, {
+                childList: true,
+                subtree: true,
+            });
+        }
     }
 }
 
@@ -868,12 +877,21 @@ if (!ytvs.isMusic) {
                 );
             }
         });
-        setTimeout(() => {
-            shortsListener.observe(
-                ytvs.$('ytd-page-manager'),
-                { childList: true },
-                ytvs.$('ytd-page-manager') ? 0 : 200,
-            );
-        });
+        const pageManager = ytvs.$('ytd-page-manager');
+        if (pageManager) {
+            shortsListener.observe(pageManager, { childList: true });
+        } else {
+            new MutationObserver((_, observer) => {
+                if (ytvs.$('ytd-page-manager')) {
+                    observer.disconnect();
+                    shortsListener.observe(ytvs.$('ytd-page-manager'), {
+                        childList: true,
+                    });
+                }
+            }).observe(document.documentElement, {
+                childList: true,
+                subtree: true,
+            });
+        }
     }
 }