diff --git a/modulearn/src/App.svelte b/modulearn/src/App.svelte index d00e437..9f52f1c 100644 --- a/modulearn/src/App.svelte +++ b/modulearn/src/App.svelte @@ -13,7 +13,6 @@ interval = setInterval(() => { const pos = video.position() const newModule = getModule(pos) - if (!pos) return console.log('no pos') position.update(() => pos) if (newModule && !$currentModule || newModule && $currentModule && newModule.name !== $currentModule.name) @@ -36,7 +35,6 @@ const onRepositionInModule = event => { const { percentage } = event.detail const pos = $currentModule.start + ($currentModule.duration * percentage / 100) - console.log(pos) jumpTo(pos) } diff --git a/modulearn/src/Module.svelte b/modulearn/src/Module.svelte index 426018d..8926279 100644 --- a/modulearn/src/Module.svelte +++ b/modulearn/src/Module.svelte @@ -2,13 +2,13 @@ import { createEventDispatcher } from 'svelte'; import { currentModule, position } from "./stores" - const dispatch = createEventDispatcher() - export let module - let progressBar + + const dispatch = createEventDispatcher() + const progressWidth = 240 const getProgress = pos => (pos - module.start) / module.duration * 100 - let selected; let progress; let klass; + let selected; let progress; let klass; let progressBar $: selected = $currentModule && $currentModule.name === module.name $: if (selected) { @@ -17,34 +17,30 @@ } else { progress = null; klass = "" - } + } const progressClick = e => { // https://stackoverflow.com/a/28311723/4386191 - const max = 160 const pos = e.pageX - progressBar.offsetLeft - let dual = Math.round(pos / max * 100) - - if (dual > 100) { - console.log(dual) - dual = 100; - } - + let dual = Math.round(pos / progressWidth * 100) + if (dual > 100) dual = 100; dispatch("repositionInModule", {percentage: dual}) - - } + }
dispatch("selectModule", { module })} > I want to {module.outcome}. {#if progress} - Hi + + {/if}
- -