Redo everything in the MR

This commit is contained in:
shpuld 2019-01-26 17:45:03 +02:00
parent 8761e039d0
commit 3978aaef84
19 changed files with 563 additions and 92 deletions

View file

@ -1,9 +1,11 @@
import StillImage from '../still-image/still-image.vue'
import VideoAttachment from '../video_attachment/video_attachment.vue'
import fileTypeService from '../../services/file_type/file_type.service.js'
const MediaModal = {
components: {
StillImage
StillImage,
VideoAttachment
},
computed: {
showing () {
@ -17,9 +19,6 @@ const MediaModal = {
},
type () {
return this.currentMedia ? fileTypeService.fileType(this.currentMedia.mimetype) : null
},
loopVideo () {
return this.$store.state.config.loopVideo
}
},
created () {

View file

@ -1,14 +1,13 @@
<template>
<div class="modal-view" v-if="showing" @click.prevent="hide">
<img class="modal-image" v-if="type === 'image'" :src="currentMedia.url"></img>
<video
<VideoAttachment
class="modal-image"
v-if="type === 'video'"
:src="currentMedia.url"
@click.stop=""
controls autoplay
:loop="loopVideo">
</video>
:attachment="currentMedia"
:controls="true"
@click.stop.native="">
</VideoAttachment>
</div>
</template>
@ -18,7 +17,7 @@
@import '../../_variables.scss';
.modal-view {
z-index: 1005;
z-index: 1000;
position: fixed;
width: 100vw;
height: 100vh;