Polish for videos, smaller sizes, remove gif-looping options

1 files changed, 2 insertions, 37 deletions

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 5e672ef2..2698fb67 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -15,10 +15,7 @@ const Attachment = {
       nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
       preloadImage: this.$store.state.config.preloadImage,
-      loopVideo: this.$store.state.config.loopVideo,
-      showHidden: false,
       loading: false,
-      img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img'),
       modalOpen: false
     }
   },
@@ -33,7 +30,7 @@ const Attachment = {
       return fileTypeService.fileType(this.attachment.mimetype)
     },
     hidden () {
-      return this.nsfw && this.hideNsfwLocal && !this.showHidden
+      return this.nsfw && this.hideNsfwLocal
     },
     isEmpty () {
       return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown'
@@ -51,46 +48,14 @@ const Attachment = {
         window.open(target.href, '_blank')
       }
     },
-    toggleHidden () {
-      if (this.img && !this.preloadImage) {
-        if (this.img.onload) {
-          this.img.onload()
-        } else {
-          this.loading = true
-          this.img.src = this.attachment.url
-          this.img.onload = () => {
-            this.loading = false
-            this.showHidden = !this.showHidden
-          }
-        }
-      } else {
-        this.showHidden = !this.showHidden
-      }
-    },
     toggleModal (event) {
       if (this.type !== 'image' && this.type !== 'video') {
         return
       }
+      event.stopPropagation()
       event.preventDefault()
       this.setMedia()
       this.$store.dispatch('setCurrent', this.attachment)
-    },
-    onVideoDataLoad (e) {
-      if (typeof e.srcElement.webkitAudioDecodedByteCount !== 'undefined') {
-        // non-zero if video has audio track
-        if (e.srcElement.webkitAudioDecodedByteCount > 0) {
-          this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
-        }
-      } else if (typeof e.srcElement.mozHasAudio !== 'undefined') {
-        // true if video has audio track
-        if (e.srcElement.mozHasAudio) {
-          this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
-        }
-      } else if (typeof e.srcElement.audioTracks !== 'undefined') {
-        if (e.srcElement.audioTracks.length > 0) {
-          this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
-        }
-      }
     }
   }
 }