Merge pull request #668 from SashaXser/main

Перенос обработчика mousemove и mouseup на this.container
ilyhalight · Jun 18, 2024 · b5142c8 · b5142c8
2 parents 7edc95c + 27c8aad
commit b5142c8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 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
@@ -4334,7 +4334,7 @@ const sites = () => {
       host: "yandexdisk",
       url: "https://yadi.sk/i/",
       match: /^disk.yandex.ru$/,
-      selector: "yaplayertag > div:nth-of-type(1)",
+      selector: ".video-player__player > div:nth-child(1)",
     },
     {
       host: "coursehunter",
@@ -5486,19 +5486,19 @@ class VideoHandler {
         this.dragging = true;
       });
 
-      document.addEventListener("mouseup", () => {
+      this.container.addEventListener("mouseup", () => {
         this.dragging = false;
       });
 
-      document.addEventListener("mousemove", async (e) => {
+      this.container.addEventListener("mousemove", async (e) => {
         if (this.dragging) {
           e.preventDefault();
 
-          const percentX = (e.clientX / this.video.clientWidth) * 100;
+          const percentX = (e.clientX / this.container.clientWidth) * 100;
           // const percentY = (e.clientY / this.video.clientHeight) * 100;
 
           this.data.buttonPos =
-            this.video.clientWidth && this.video.clientWidth > 550
+            this.container.clientWidth && this.container.clientWidth > 550
               ? percentX <= 33
                 ? "left"
                 : percentX >= 66
@@ -5509,7 +5509,7 @@ class VideoHandler {
             this.data.buttonPos === "default" ? "row" : "column";
           this.votButton.container.dataset.position = this.data.buttonPos;
           this.votMenu.container.dataset.position = this.data.buttonPos;
-          if (this.video.clientWidth && this.video.clientWidth > 550) {
+          if (this.container.clientWidth && this.container.clientWidth > 550) {
             await storage/* votStorage */.d.set("buttonPos", this.data.buttonPos);
           }
         }

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
@@ -4233,7 +4233,7 @@ const sites = () => {
       host: "yandexdisk",
       url: "https://yadi.sk/i/",
       match: /^disk.yandex.ru$/,
-      selector: "yaplayertag > div:nth-of-type(1)",
+      selector: ".video-player__player > div:nth-child(1)",
     },
     {
       host: "coursehunter",
@@ -5376,19 +5376,19 @@ class VideoHandler {
         this.dragging = true;
       });
 
-      document.addEventListener("mouseup", () => {
+      this.container.addEventListener("mouseup", () => {
         this.dragging = false;
       });
 
-      document.addEventListener("mousemove", async (e) => {
+      this.container.addEventListener("mousemove", async (e) => {
         if (this.dragging) {
           e.preventDefault();
 
-          const percentX = (e.clientX / this.video.clientWidth) * 100;
+          const percentX = (e.clientX / this.container.clientWidth) * 100;
           // const percentY = (e.clientY / this.video.clientHeight) * 100;
 
           this.data.buttonPos =
-            this.video.clientWidth && this.video.clientWidth > 550
+            this.container.clientWidth && this.container.clientWidth > 550
               ? percentX <= 33
                 ? "left"
                 : percentX >= 66
@@ -5399,7 +5399,7 @@ class VideoHandler {
             this.data.buttonPos === "default" ? "row" : "column";
           this.votButton.container.dataset.position = this.data.buttonPos;
           this.votMenu.container.dataset.position = this.data.buttonPos;
-          if (this.video.clientWidth && this.video.clientWidth > 550) {
+          if (this.container.clientWidth && this.container.clientWidth > 550) {
             await votStorage.set("buttonPos", this.data.buttonPos);
           }
         }

diff --git a/src/config/sites.js b/src/config/sites.js
@@ -230,7 +230,7 @@ const sites = () => {
       host: "yandexdisk",
       url: "https://yadi.sk/i/",
       match: /^disk.yandex.ru$/,
-      selector: "yaplayertag > div:nth-of-type(1)",
+      selector: ".video-player__player > div:nth-child(1)",
     },
     {
       host: "coursehunter",

diff --git a/src/index.js b/src/index.js
@@ -904,19 +904,19 @@ class VideoHandler {
         this.dragging = true;
       });
 
-      document.addEventListener("mouseup", () => {
+      this.container.addEventListener("mouseup", () => {
         this.dragging = false;
       });
 
-      document.addEventListener("mousemove", async (e) => {
+      this.container.addEventListener("mousemove", async (e) => {
         if (this.dragging) {
           e.preventDefault();
 
-          const percentX = (e.clientX / this.video.clientWidth) * 100;
+          const percentX = (e.clientX / this.container.clientWidth) * 100;
           // const percentY = (e.clientY / this.video.clientHeight) * 100;
 
           this.data.buttonPos =
-            this.video.clientWidth && this.video.clientWidth > 550
+            this.container.clientWidth && this.container.clientWidth > 550
               ? percentX <= 33
                 ? "left"
                 : percentX >= 66
@@ -927,7 +927,7 @@ class VideoHandler {
             this.data.buttonPos === "default" ? "row" : "column";
           this.votButton.container.dataset.position = this.data.buttonPos;
           this.votMenu.container.dataset.position = this.data.buttonPos;
-          if (this.video.clientWidth && this.video.clientWidth > 550) {
+          if (this.container.clientWidth && this.container.clientWidth > 550) {
             await votStorage.set("buttonPos", this.data.buttonPos);
           }
         }