Merge branch 'fixes-and-tweaks' into 'develop'

Fixes and tweaks

See merge request pleroma/pleroma-fe!307

1 files changed, 30 insertions, 8 deletions

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index d9bc4477..cc19714d 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -13,9 +13,10 @@ const Attachment = {
     return {
       nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
+      loopVideo: this.$store.state.config.loopVideo,
       showHidden: false,
       loading: false,
-      img: document.createElement('img')
+      img: this.type === 'image' && document.createElement('img')
     }
   },
   components: {
@@ -45,14 +46,35 @@ const Attachment = {
       }
     },
     toggleHidden () {
-      if (this.img.onload) {
-        this.img.onload()
+      if (this.img) {
+        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.loading = true
-        this.img.src = this.attachment.url
-        this.img.onload = () => {
-          this.loading = false
-          this.showHidden = !this.showHidden
+        this.showHidden = !this.showHidden
+      }
+    },
+    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
         }
       }
     }