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/settings | |
| 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/settings')
| -rw-r--r-- | src/components/settings/settings.js | 6 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 7000fa5e..8d138485 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -66,7 +66,7 @@ const settings = { Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') || // Future spec, still not supported in Nightly 63 as of 08/2018 Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'), - playVideosInline: user.playVideosInline, + playVideosInModal: user.playVideosInModal, useContainFit: user.useContainFit } }, @@ -164,8 +164,8 @@ const settings = { this.$store.dispatch('setOption', { name: 'webPushNotifications', value }) if (value) this.$store.dispatch('registerPushNotifications') }, - playVideosInline (value) { - this.$store.dispatch('setOption', { name: 'playVideosInline', value }) + playVideosInModal (value) { + this.$store.dispatch('setOption', { name: 'playVideosInModal', value }) }, useContainFit (value) { this.$store.dispatch('setOption', { name: 'useContainFit', value }) diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 08d659d6..9953780f 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -146,8 +146,8 @@ </ul> </li> <li> - <input type="checkbox" id="playVideosInline" v-model="playVideosInline"> - <label for="playVideosInline">{{$t('settings.play_videos_inline')}}</label> + <input type="checkbox" id="playVideosInModal" v-model="playVideosInModal"> + <label for="playVideosInModal">{{$t('settings.play_videos_in_modal')}}</label> </li> <li> <input type="checkbox" id="useContainFit" v-model="useContainFit"> |