From 9903b077ac5ed5e288dfe129c375ca8d051b5676 Mon Sep 17 00:00:00 2001 From: A-Circle Zhang Date: Thu, 23 Aug 2018 23:07:45 +0800 Subject: [PATCH 1/3] Update controller.scss --- src/css/controller.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/css/controller.scss b/src/css/controller.scss index c294d05..def128c 100644 --- a/src/css/controller.scss +++ b/src/css/controller.scss @@ -100,7 +100,6 @@ position: absolute; left: 0px; top: -20px; - width: 30px; border-radius: 4px; padding: 5px 7px; background-color: rgba(0, 0, 0, 0.62); From bb0fb95c3c3aac52637c58d3ae244a1e955d6ad6 Mon Sep 17 00:00:00 2001 From: A-Circle Zhang Date: Thu, 23 Aug 2018 23:08:50 +0800 Subject: [PATCH 2/3] Update controller.js --- src/js/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controller.js b/src/js/controller.js index ac94a3d..86dd7ca 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -134,7 +134,7 @@ class Controller { this.thumbnails && this.thumbnails.show(); } this.thumbnails && this.thumbnails.move(tx); - this.player.template.playedBarTime.style.left = `${(tx - 20)}px`; + this.player.template.playedBarTime.style.left = `${(tx - (time >= 3600 ? 25 : 20))}px`; this.player.template.playedBarTime.innerText = utils.secondToTime(time); this.player.template.playedBarTime.classList.remove('hidden'); } From 474eb0e7198beb8d5f68992c926a3fb28f109c78 Mon Sep 17 00:00:00 2001 From: A-Circle Zhang Date: Thu, 23 Aug 2018 23:10:53 +0800 Subject: [PATCH 3/3] Update thumbnails.js --- src/js/thumbnails.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/thumbnails.js b/src/js/thumbnails.js index 66271c5..b5de89f 100644 --- a/src/js/thumbnails.js +++ b/src/js/thumbnails.js @@ -19,7 +19,7 @@ class Thumbnails { move (position) { this.container.style.backgroundPosition = `-${(Math.ceil(position / this.barWidth * 100) - 1) * 160}px 0`; - this.container.style.left = `${(position - this.container.offsetWidth / 2)}px`; + this.container.style.left = `${Math.min(Math.max(position - this.container.offsetWidth / 2, -10), this.barWidth - 150)}px`; } hide () { @@ -29,4 +29,4 @@ class Thumbnails { } } -export default Thumbnails; \ No newline at end of file +export default Thumbnails;