summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNya Candy <dev@candinya.com>2021-03-06 20:38:39 +0800
committerGitHub <noreply@github.com>2021-03-06 21:38:39 +0900
commit3003100443fd3e43b45accff858a1c755c233abe (patch)
treec1610e45b7832928ec39e370a0235bf4037504aa /src
parentrefactor assets (diff)
downloadsharkey-3003100443fd3e43b45accff858a1c755c233abe.tar.gz
sharkey-3003100443fd3e43b45accff858a1c755c233abe.tar.bz2
sharkey-3003100443fd3e43b45accff858a1c755c233abe.zip
feat: video play inline (using video tag) (#7242)
Diffstat (limited to 'src')
-rw-r--r--src/client/components/media-video.vue30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue
index 3788947206..bdd3983e1e 100644
--- a/src/client/components/media-video.vue
+++ b/src/client/components/media-video.vue
@@ -6,22 +6,24 @@
</div>
</div>
<div class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else>
- <i><Fa :icon="faEyeSlash" @click="hide = true"/></i>
- <a
- :href="video.url"
- rel="nofollow noopener"
- target="_blank"
- :style="imageStyle"
+ <video
+ :poster="video.thumbnailUrl"
:title="video.name"
+ crossorigin="anonymous"
+ preload="none"
+ controls
>
- <Fa :icon="faPlayCircle"/>
- </a>
+ <source
+ :src="video.url"
+ :type="video.type"
+ >
+ </video>
+ <i><Fa :icon="faEyeSlash" @click="hide = true"/></i>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
-import { faPlayCircle } from '@fortawesome/free-regular-svg-icons';
import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons';
import * as os from '@/os';
@@ -35,18 +37,10 @@ export default defineComponent({
data() {
return {
hide: true,
- faPlayCircle,
faExclamationTriangle,
faEyeSlash
};
},
- computed: {
- imageStyle(): any {
- return {
- 'background-image': `url(${this.video.thumbnailUrl})`
- };
- }
- },
created() {
this.hide = (this.$store.state.nsfw === 'force') ? true : this.video.isSensitive && (this.$store.state.nsfw !== 'ignore');
},
@@ -72,7 +66,7 @@ export default defineComponent({
right: 12px;
}
- > a {
+ > video {
display: flex;
justify-content: center;
align-items: center;