quasar-ui-danx 0.3.32 → 0.3.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.3.32",
+  "version": "0.3.34",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/Utility/Dialogs/FullscreenCarouselDialog.vue

@@ -31,7 +31,7 @@
               >
                 <source
                   :src="getPreviewUrl(file) + '#t=0.1'"
-                  :type="file.mime"
+                  :type="getPreviewFileMime(file)"
                 >
               </video>
             </template>
@@ -72,8 +72,16 @@ function isVideo(file) {
 	return file.mime?.startsWith("video");
 }
 
+function getPreviewFile(file) {
+	return file.transcodes?.mp4 || file.transcodes?.compress || file;
+}
+function getPreviewFileMime(file) {
+	return getPreviewFile(file).mime || (isVideo(file) ? "video/mp4" : "");
+}
+
 function getPreviewUrl(file) {
-	return file.transcodes?.compress?.url || file.blobUrl || file.url;
+	file = getPreviewFile(file);
+	return file.blobUrl || file.url;
 }
 
 function getThumbUrl(file) {

package/src/components/Utility/Files/FilePreview.vue

@@ -161,21 +161,20 @@ const computedImage = computed(() => {
 	}
 	return null;
 });
+const previewFile = computed(() => {
+	const transcodes = computedImage.value?.transcodes;
+	return transcodes?.mp4 || transcodes?.compress || computedImage.value;
+});
+
 const mimeType = computed(
-	() => computedImage.value?.type || computedImage.value?.mime || ""
+	() => previewFile.value?.type || previewFile.value?.mime || (computedImage.value?.transcodes?.mp4 ? "video/mp4" : "")
 );
 const isImage = computed(() => !!mimeType.value.match(/^image\//));
 const isVideo = computed(() => !!mimeType.value.match(/^video\//));
 const isPdf = computed(() => !!mimeType.value.match(/^application\/pdf/));
-const previewUrl = computed(() => {
-	const transcodes = computedImage.value?.transcodes;
-
-	console.log("calc preview", transcodes, computedImage.value);
-	if (isVideo.value && transcodes?.mp4?.url) {
-		return transcodes.mp4.url;
-	}
 
-	return transcodes?.compress?.url || computedImage.value?.blobUrl || computedImage.value?.url;
+const previewUrl = computed(() => {
+	return previewFile.value?.blobUrl || previewFile.value?.url;
 });
 const thumbUrl = computed(() => {
 	return computedImage.value?.transcodes?.thumb?.url;