xiaoxue_admin
/
DPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
DIYgod 2019-03-12 22:29:53 +08:00
parent 688563f594 47b1615ef8
commit f5c53f0826
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controller.js
View File

@ -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);
});
}
}

3
src/js/player.js
View File

@ -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');
}

3
src/js/thumbnails.js
View File

@ -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 () {

2
src/js/utils.js
View File

@ -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') {