Merge branch 'fix/default-inlined-videos' into 'develop'

Change video playing default without bothering making it an instance configurable

See merge request pleroma/pleroma-fe!505
This commit is contained in:
Shpuld Shpludson 2019-02-03 06:45:04 +00:00
commit f0721ed83b
7 changed files with 14 additions and 17 deletions

View file

@ -222,9 +222,9 @@ const Status = {
if (this.attachmentSize === 'hide') {
return []
}
return this.$store.state.config.playVideosInline
? ['image']
: ['image', 'video']
return this.$store.state.config.playVideosInModal
? ['image', 'video']
: ['image']
},
galleryAttachments () {
return this.status.attachments.filter(