Merge pull request #1350 from nextcloud/fix/non-dav-audio-gif-video

Fix opening non-dav audio, gif and video
nextcloud · Aug 25, 2022 · 61f7935 · 61f7935
2 parents 0a45152 + 96b28c3
commit 61f7935
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/components/Audios.vue b/src/components/Audios.vue
@@ -23,12 +23,12 @@
 <template>
 	<!-- Plyr currently replaces the parent. Wrapping to prevent this
 	https://github.com/redxtech/vue-plyr/issues/259 -->
-	<div v-if="davPath">
+	<div v-if="src">
 		<VuePlyr ref="plyr"
 			:options="options">
 			<audio ref="audio"
 				:autoplay="active"
-				:src="davPath"
+				:src="src"
 				preload="metadata"
 				@ended="donePlaying"
 				@canplay="doneLoading">

diff --git a/src/components/Images.vue b/src/components/Images.vue
@@ -23,7 +23,7 @@
 <template>
 	<ImageEditor v-if="editing"
 		:mime="mime"
-		:src="davPath"
+		:src="src"
 		:filename="filename"
 		@close="onClose" />
 
@@ -77,6 +77,9 @@ export default {
 	},
 
 	computed: {
+		src() {
+			return this.source ?? this.davPath
+		},
 		zoomHeight() {
 			return Math.round(this.height * this.zoomRatio)
 		},
@@ -87,6 +90,10 @@ export default {
 
 	asyncComputed: {
 		data() {
+			if (this.source) {
+				return this.source
+			}
+
 			switch (this.mime) {
 			case 'image/svg+xml':
 				return this.getBase64FromImage()

diff --git a/src/components/Videos.vue b/src/components/Videos.vue
@@ -23,7 +23,7 @@
 <template>
 	<!-- Plyr currently replaces the parent. Wrapping to prevent this
 	https://github.com/redxtech/vue-plyr/issues/259 -->
-	<div v-if="davPath">
+	<div v-if="src">
 		<VuePlyr ref="plyr"
 			:options="options"
 			:style="{
@@ -34,7 +34,7 @@
 				:autoplay="active ? true : null"
 				:playsinline="true"
 				:poster="livePhotoPath"
-				:src="davPath"
+				:src="src"
 				preload="metadata"
 				@ended="donePlaying"
 				@canplay="doneLoading"

diff --git a/src/mixins/Mime.js b/src/mixins/Mime.js
@@ -107,6 +107,9 @@ export default {
 		ext() {
 			return parsePath(this.basename).ext
 		},
+		src() {
+			return this.source ?? this.davPath
+		},
 	},
 
 	watch: {

diff --git a/src/mixins/PreviewUrl.js b/src/mixins/PreviewUrl.js
@@ -52,7 +52,6 @@ export default {
 				basename: this.basename,
 			})
 		},
-
 	},
 	methods: {
 		/**