Merge branch 'master' of github.com:MoePlayer/DPlayer

zantop · Mar 12, 2019 · f5c53f0 · f5c53f0
2 parents 688563f + 47b1615
commit f5c53f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/js/controller.js b/src/js/controller.js
@@ -91,7 +91,7 @@ class Controller {
             });
 
             this.player.on('loadedmetadata', () => {
-                this.thumbnails.resize(160, this.player.video.videoHeight / this.player.video.videoWidth * 160);
+                this.thumbnails.resize(160, this.player.video.videoHeight / this.player.video.videoWidth * 160, this.player.template.barWrap.offsetWidth);
             });
         }
     }

diff --git a/src/js/player.js b/src/js/player.js
@@ -564,6 +564,9 @@ class DPlayer {
         if (this.danmaku) {
             this.danmaku.resize();
         }
+        if (this.controller.thumbnails) {
+            this.controller.thumbnails.resize(160, this.video.videoHeight / this.video.videoWidth * 160, this.template.barWrap.offsetWidth);
+        }
         this.events.trigger('resize');
     }
 

diff --git a/src/js/thumbnails.js b/src/js/thumbnails.js
@@ -6,10 +6,11 @@ class Thumbnails {
         this.events = options.events;
     }
 
-    resize (width, height) {
+    resize (width, height, barWrapWidth) {
         this.container.style.width = `${width}px`;
         this.container.style.height = `${height}px`;
         this.container.style.top = `${-height + 2}px`;
+        this.barWidth = barWrapWidth;
     }
 
     show () {

diff --git a/src/js/utils.js b/src/js/utils.js
@@ -48,7 +48,7 @@ const utils = {
     * getBoundingClientRect 在 Opera 10.5 及以下返回的值缺失 width、height 值
     */
     getBoundingClientRectViewLeft (element) {
-        const scrollTop = document.documentElement.scrollTop;
+        const scrollTop = window.scrollY || window.pageYOffset || document.body.scrollTop + (document.documentElement && document.documentElement.scrollTop || 0);
 
         if (element.getBoundingClientRect) {
             if (typeof this.getBoundingClientRectViewLeft.offset !== 'number') {
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ class Controller { @@
                 });
                 this.player.on('loadedmetadata', () => {
-                    this.thumbnails.resize(160, this.player.video.videoHeight / this.player.video.videoWidth * 160);
+                    this.thumbnails.resize(160, this.player.video.videoHeight / this.player.video.videoWidth * 160, this.player.template.barWrap.offsetWidth);
                 });
             }
         }
@@ Expand Down @@