diff --git a/svelte/src/file_viewer/viewers/Video.svelte b/svelte/src/file_viewer/viewers/Video.svelte
index ace0351..fbda3c8 100644
--- a/svelte/src/file_viewer/viewers/Video.svelte
+++ b/svelte/src/file_viewer/viewers/Video.svelte
@@ -62,11 +62,6 @@ const download = () => { dispatch("download", {}) }
const toggle_play = () => playing ? player.pause() : player.play()
-// let video_seeker
-// const seek = () => {
-// player.fastSeek(player.duration * (video_seeker.value/1000))
-// }
-
const seek_relative = delta => {
if (player.fastSeek) {
player.fastSeek(player.currentTime + delta)
@@ -75,17 +70,10 @@ const seek_relative = delta => {
}
}
-// let volume_seeker
-// const volume_seek = () => {
-// player.volume = volume_seeker.value/100
-// }
-
const mute = () => {
if (player.muted) {
- // volume_seeker.disabled = false
player.muted = false
} else {
- // volume_seeker.disabled = true
player.muted = true
}
}
@@ -111,60 +99,62 @@ const fullscreen = () => {
{/if}
-
-
- playing = false }
- on:play={() => playing = true }
- on:ended={() => dispatch("next", {})}
- >
-
-
-
+
+
+
+ playing = false }
+ on:play={() => playing = true }
+ on:ended={() => dispatch("next", {})}
+ >
+
+
+
-
-
- {#if is_list}
-
dispatch("prev") }>
- skip_previous
-
- {/if}
-
seek_relative(-10)}>
- replay_10
-
-
- {#if playing}
- pause
- {:else}
- play_arrow
+
+
+ {#if is_list}
+
dispatch("prev") }>
+ skip_previous
+
{/if}
-
-
seek_relative(10)}>
- forward_10
-
- {#if is_list}
-
dispatch("next") }>
- skip_next
+ seek_relative(-10)}>
+ replay_10
- {/if}
-
-
- {#if player && player.muted}
- volume_off
- {:else}
- volume_up
+
+ {#if playing}
+ pause
+ {:else}
+ play_arrow
+ {/if}
+
+ seek_relative(10)}>
+ forward_10
+
+ {#if is_list}
+ dispatch("next") }>
+ skip_next
+
{/if}
-
-
- fullscreen
-
-
+
+
+ {#if player && player.muted}
+ volume_off
+ {:else}
+ volume_up
+ {/if}
+
+
+ fullscreen
+
+
+
@@ -202,6 +192,12 @@ h1 {
height: 100%;
width: 100%;
}
+.player_and_controls {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ width: 100%;
+}
.player {
flex: 1 1 auto;
display: flex;
@@ -231,7 +227,7 @@ h1 {
max-height: 100%;
}
@media(max-height: 500px) {
- .container {
+ .player_and_controls {
flex-direction: row;
}
.controls {
diff --git a/svelte/src/filesystem/viewers/Video.svelte b/svelte/src/filesystem/viewers/Video.svelte
index 132238f..0e6bef7 100644
--- a/svelte/src/filesystem/viewers/Video.svelte
+++ b/svelte/src/filesystem/viewers/Video.svelte
@@ -60,10 +60,8 @@ const seek_relative = delta => {
const mute = () => {
if (player.muted) {
- // volume_seeker.disabled = false
player.muted = false
} else {
- // volume_seeker.disabled = true
player.muted = true
}
}
@@ -74,18 +72,18 @@ const fullscreen = () => {
- {#if
- state.base.file_type === "video/x-matroska" ||
- state.base.file_type === "video/quicktime" ||
- state.base.file_type === "video/x-ms-asf"
- }
-
- This video file type is not compatible with every web
- browser. If the video fails to play you can try downloading
- the video and watching it locally.
-
- {/if}
-
+ {#if
+ state.base.file_type === "video/x-matroska" ||
+ state.base.file_type === "video/quicktime" ||
+ state.base.file_type === "video/x-ms-asf"
+ }
+
+ This video file type is not compatible with every web
+ browser. If the video fails to play you can try downloading
+ the video and watching it locally.
+
+ {/if}
+
{#if loaded}
@@ -95,7 +93,7 @@ const fullscreen = () => {
playsinline
autoplay
loop={loop}
- class="video drop_shadow"
+ class="video"
on:pause={() => playing = false }
on:play={() => playing = true }
on:ended={() => dispatch("next", {})}
@@ -105,39 +103,40 @@ const fullscreen = () => {
{/if}
-
-
-
dispatch("open_sibling", -1) }>
- skip_previous
-
-
seek_relative(-10)}>
- replay_10
-
-
- {#if playing}
- pause
- {:else}
- play_arrow
- {/if}
-
-
seek_relative(10)}>
- forward_10
-
-
dispatch("open_sibling", 1) }>
- skip_next
-
-
-
- {#if player && player.muted}
- volume_off
- {:else}
- volume_up
- {/if}
-
-
- fullscreen
-
-
+
+
+
dispatch("open_sibling", -1) }>
+ skip_previous
+
+
seek_relative(-10)}>
+ replay_10
+
+
+ {#if playing}
+ pause
+ {:else}
+ play_arrow
+ {/if}
+
+
seek_relative(10)}>
+ forward_10
+
+
dispatch("open_sibling", 1) }>
+ skip_next
+
+
+
+ {#if player && player.muted}
+ volume_off
+ {:else}
+ volume_up
+ {/if}
+
+
+ fullscreen
+
+
+
@@ -148,6 +147,12 @@ const fullscreen = () => {
height: 100%;
width: 100%;
}
+.player_and_controls {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ width: 100%;
+}
.player {
flex: 1 1 auto;
display: flex;
@@ -177,7 +182,7 @@ const fullscreen = () => {
max-height: 100%;
}
@media(max-height: 500px) {
- .container {
+ .player_and_controls {
flex-direction: row;
}
.controls {