diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 66896d1d..4da54337 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.10.14", + "version": "1.10.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.10.14", + "version": "1.10.15", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 2203943e..c9d1f87d 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -303,7 +303,7 @@ clearTimeout(pauseTimeout); } pauseTimeout = setTimeout(() => { - playerElement.pause(); + playerElement?.pause(); pauseTimerSeconds = 0; clearTimeout(pauseTimeout); }, pauseTimerSeconds * 1000); @@ -341,15 +341,14 @@ {#if data.video.lengthSeconds > 360 && !data.video.hlsUrl} { - if (pauseTimeout) { - clearTimeout(pauseTimeout); + if (pauseTimerSeconds < 1) { + pauseTimerSeconds = 300; } - pauseTimerSeconds = 0; ui('#pause-timer'); }} class:border={pauseTimerSeconds < 1} > - schedule + snooze {$_('player.pauseTimer')} {/if} @@ -578,34 +577,39 @@ {/if} - - - - - - - {#if pauseTimerSeconds > 0} - {$_('player.pauseVideoIn')} {humanizeSeconds(pauseTimerSeconds)} - {/if} + { + if (pauseTimerSeconds > 0) setPauseTimer(); + (event.target as HTMLDialogElement).close(); + }} +> + + {$_('player.pauseVideoIn')} {humanizeSeconds(pauseTimerSeconds)} + + + (pauseTimerSeconds += 300)} class="left-round">+5 mins + (pauseTimerSeconds += 1800)} class="no-round">+30 mins + (pauseTimerSeconds += 3600)} class="no-round">+1 hr + (pauseTimerSeconds += 7200)} class="right-round">+2 hrs + + + + + + { + pauseTimerSeconds = 0; + clearTimeout(pauseTimeout); + ui('#pause-timer'); + }} + class="secondary max" + > + delete + Clear + + - - { - ui('#pause-timer'); - pauseTimerSeconds = 0; - }}>Cancel - Confirm -