Change video playing default without bothering making it an instance configurable

4 files changed, 11 insertions, 11 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
       ) {
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 06011e7c..7353b0e4 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">
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ec4de516..c07c60e1 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -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(