diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-03 06:45:04 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-03 06:45:04 +0000 |
| commit | f0721ed83b7ebdb43d9a643a086508078bf1466e (patch) | |
| tree | 62b1f703171841fa3042307f0a51585fa7d68648 /src/components/attachment/attachment.js | |
| parent | 815b9d239145d29c9c2472a5abd1a9d1fb653903 (diff) | |
| parent | a8c6b3f538dc97b93411213f72e90c16156f3926 (diff) | |
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
Diffstat (limited to 'src/components/attachment/attachment.js')
| -rw-r--r-- | src/components/attachment/attachment.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 47939852..3b7f08dc 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -57,9 +57,9 @@ const Attachment = { } }, openModal (event) { - const modalTypes = this.$store.state.config.playVideosInline - ? ['image'] - : ['image', 'video'] + const modalTypes = this.$store.state.config.playVideosInModal + ? ['image', 'video'] + : ['image'] if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) || this.usePlaceHolder ) { |