Merge pull request #658 from SashaXser/main

Fix #657
ilyhalight · Jun 9, 2024 · 88cceeb · 88cceeb
2 parents 096a212 + 6b42950
commit 88cceeb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 32 deletions.
diff --git a/dist/vot-cloudflare-min.user.js b/dist/vot-cloudflare-min.user.js
diff --git a/dist/vot-cloudflare.user.js b/dist/vot-cloudflare.user.js
@@ -1224,7 +1224,7 @@ const getVideoId = (service, video) => {
       }
 
       return (
-        url.pathname.match(/(?:watch|embed|shorts)\/([^/]+)/)?.[1] ||
+        url.pathname.match(/(?:watch|embed|shorts|live)\/([^/]+)/)?.[1] ||
         url.searchParams.get("v")
       );
     }
@@ -5795,7 +5795,6 @@ class VideoHandler {
   }
 
   releaseExtraEvents() {
-    clearInterval(this.resizeInterval);
     this.resizeObserver?.disconnect();
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&
@@ -5856,14 +5855,6 @@ class VideoHandler {
       "style",
       `--vot-container-height: ${this.video.getBoundingClientRect().height}px`,
     );
-    this.resizeInterval = setInterval(() => {
-      this.votMenu.container.setAttribute(
-        "style",
-        `--vot-container-height: ${
-          this.video.getBoundingClientRect().height
-        }px`,
-      );
-    }, 500);
     // Sync menu volume slider with youtube original video (youtube only)
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&

diff --git a/dist/vot-min.user.js b/dist/vot-min.user.js
diff --git a/dist/vot.user.js b/dist/vot.user.js
@@ -1458,7 +1458,7 @@ const getVideoId = (service, video) => {
       }
 
       return (
-        url.pathname.match(/(?:watch|embed|shorts)\/([^/]+)/)?.[1] ||
+        url.pathname.match(/(?:watch|embed|shorts|live)\/([^/]+)/)?.[1] ||
         url.searchParams.get("v")
       );
     }
@@ -5685,7 +5685,6 @@ class VideoHandler {
   }
 
   releaseExtraEvents() {
-    clearInterval(this.resizeInterval);
     this.resizeObserver?.disconnect();
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&
@@ -5746,14 +5745,6 @@ class VideoHandler {
       "style",
       `--vot-container-height: ${this.video.getBoundingClientRect().height}px`,
     );
-    this.resizeInterval = setInterval(() => {
-      this.votMenu.container.setAttribute(
-        "style",
-        `--vot-container-height: ${
-          this.video.getBoundingClientRect().height
-        }px`,
-      );
-    }, 500);
     // Sync menu volume slider with youtube original video (youtube only)
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&

diff --git a/src/index.js b/src/index.js
@@ -1202,7 +1202,6 @@ class VideoHandler {
   }
 
   releaseExtraEvents() {
-    clearInterval(this.resizeInterval);
     this.resizeObserver?.disconnect();
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&
@@ -1263,14 +1262,6 @@ class VideoHandler {
       "style",
       `--vot-container-height: ${this.video.getBoundingClientRect().height}px`,
     );
-    this.resizeInterval = setInterval(() => {
-      this.votMenu.container.setAttribute(
-        "style",
-        `--vot-container-height: ${
-          this.video.getBoundingClientRect().height
-        }px`,
-      );
-    }, 500);
     // Sync menu volume slider with youtube original video (youtube only)
     if (
       ["youtube", "googledrive"].includes(this.site.host) &&

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -45,7 +45,7 @@ const getVideoId = (service, video) => {
       }
 
       return (
-        url.pathname.match(/(?:watch|embed|shorts)\/([^/]+)/)?.[1] ||
+        url.pathname.match(/(?:watch|embed|shorts|live)\/([^/]+)/)?.[1] ||
         url.searchParams.get("v")
       );
     }