From 9fc0c529733329b54e6cbd584c2cb28d59ca71ee Mon Sep 17 00:00:00 2001
From: wryk <wryk@wryk.moe>
Date: Sat, 15 Feb 2020 23:54:32 +0100
Subject: [PATCH] fix progress

---
 src/components/Viewer.svelte          |  6 ------
 src/components/player/Progress.svelte | 14 +++++++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/components/Viewer.svelte b/src/components/Viewer.svelte
index f5c41e6..b669a38 100644
--- a/src/components/Viewer.svelte
+++ b/src/components/Viewer.svelte
@@ -24,8 +24,6 @@
     <Progress
         duration={duration}
         currentTime={currentTime}
-        currentTimeText={currentTimeText}
-        durationText={durationText}
         on:input={event => updateCurrentTime(event.target.value, false)}
         on:change={event => updateCurrentTime(event.target.value, true)}
     ></Progress>
@@ -35,7 +33,6 @@
     import { get } from 'svelte/store'
     import YoutubePlayer from '/components/YoutubePlayer'
     import Progress from '/components/player/Progress'
-    import { secondsToElapsedTime } from '/services/misc.js'
     import { paused, muted, volume, current, selectNext, loading } from '/store.js'
 
     let ready = null
@@ -45,9 +42,6 @@
     let duration = null
     let seek = null
 
-    $: currentTimeText = currentTime !== null ? secondsToElapsedTime(currentTime) : '--:--'
-    $: durationText = duration !== null ? secondsToElapsedTime(duration) : '--:--'
-
     $: if (ended || error) {
         selectNext()
     }
diff --git a/src/components/player/Progress.svelte b/src/components/player/Progress.svelte
index 350cdcf..082b40d 100644
--- a/src/components/player/Progress.svelte
+++ b/src/components/player/Progress.svelte
@@ -6,8 +6,8 @@
             class="playerProgress__progressInput"
             type="range"
             min="0"
-            max={duration}
-            value="{currentTime}"
+            max={max}
+            value={value}
             on:input
             on:change
             disabled={currentTime === null || duration === null}
@@ -19,10 +19,14 @@
     </div>
 </div>
 <script>
+    import { secondsToElapsedTime } from '/services/misc.js'
+
     export let duration
     export let currentTime
-    export let currentTimeText
-    export let durationText
 
-    $: currentPercent = currentTime ? (currentTime / duration) * 100 : 0
+    $: value = currentTime != null ? currentTime : 0
+    $: max = duration != null ? duration : 100
+    $: currentPercent = currentTime != null ? (currentTime / duration) * 100 : 0
+    $: currentTimeText = currentTime != null ? secondsToElapsedTime(currentTime) : '--:--'
+    $: durationText = duration != null ? secondsToElapsedTime(duration) : '--:--'
 </script>
\ No newline at end of file