quasar-ui-danx 0.3.33 → 0.3.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.3.33",
+  "version": "0.3.35",
   "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,9 +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) {
-	const transcodes = file?.transcodes;
-	return transcodes?.mp4?.url || 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,20 +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;
-
-	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;

package/src/helpers/download.ts

@@ -9,192 +9,193 @@
 
 /* eslint-disable */
 export function download(data, strFileName, strMimeType) {
-    var self = window;
-    // this script is only for browsers anyway...
-
-    var defaultMime = "application/octet-stream";
-    // this default mime also triggers iframe downloads
-
-    var mimeType = strMimeType || defaultMime;
-
-    var payload = data;
-
-    var url = !strFileName && !strMimeType && payload;
-
-    var anchor = document.createElement("a");
-
-    var toString = function (a) {
-        return String(a);
-    };
-
-    // @ts-ignore
-    var myBlob = self.Blob || self.MozBlob || self.WebKitBlob || toString;
-
-    var fileName = strFileName || "download";
-
-    var blob;
-
-    var reader;
-    myBlob = myBlob.call ? myBlob.bind(self) : Blob;
-
-    if (String(this) === "true") {
-        // reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
-        payload = [payload, mimeType];
-        mimeType = payload[0];
-        payload = payload[1];
-    }
-
-    if (url && url.length < 2048) {
-        // if no filename and no mime, assume a url was passed as the only argument
-        fileName = url.split("/").pop().split("?")[0];
-        anchor.href = url; // assign href prop to temp anchor
-
-        // if the browser determines that it's a potentially valid url path:
-        if (
-            anchor.href.indexOf(url) !== -1 ||
-            anchor.href.indexOf(encodeURI(url)) !== -1 ||
-            anchor.href === encodeURI(url)
-        ) {
-            var ajax = new XMLHttpRequest();
-            ajax.open("GET", url + "?no-cache=" + Date.now(), true);
-            ajax.responseType = "blob";
-            ajax.onload = function (e) {
-                // @ts-ignore
-                download(e.target.response, fileName, defaultMime);
-            };
-            ajax.onerror = function (e) {
-                // As a fallback, just open the request in a new tab
-                window.open(url, "_blank").focus();
-            };
-            setTimeout(function () {
-                ajax.send();
-            }, 0); // allows setting custom ajax headers using the return:
-            return ajax;
-        } else {
-            throw new Error("Invalid URL given, cannot download file: " + url);
-        }
-    } // end if url?
-
-    // go ahead and download dataURLs right away
-    if (/^data:[\w+-]+\/[\w+-]+[,;]/.test(payload)) {
-        if (payload.length > 1024 * 1024 * 1.999 && myBlob !== toString) {
-            payload = dataUrlToBlob(payload);
-            mimeType = payload.type || defaultMime;
-        } else {
-            // IE10 can't do a[download], only Blobs
-            // everyone else can save dataURLs un-processed
-            // @ts-ignore
-            return navigator.msSaveBlob ? navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : saver(payload);
-        }
-    } // end if dataURL passed?
-
-    blob =
-        payload instanceof myBlob
-            ? payload
-            : new myBlob([payload], { type: mimeType });
-
-    function dataUrlToBlob(strUrl) {
-        var parts = strUrl.split(/[:;,]/);
-
-        var type = parts[1];
-
-        var decoder = parts[2] === "base64" ? atob : decodeURIComponent;
-
-        var binData = decoder(parts.pop());
-
-        var mx = binData.length;
-
-        var i = 0;
-
-        var uiArr = new Uint8Array(mx);
-
-        for (i; i < mx; ++i) uiArr[i] = binData.charCodeAt(i);
-
-        return new myBlob([uiArr], { type: type });
-    }
-
-    function saver(url, winMode) {
-        if ("download" in anchor) {
-            // html5 A[download]
-            anchor.href = url;
-            anchor.setAttribute("download", fileName);
-            anchor.className = "download-js-link";
-            anchor.innerHTML = "downloading...";
-            anchor.style.display = "none";
-            document.body.appendChild(anchor);
-            setTimeout(function () {
-                anchor.click();
-                document.body.removeChild(anchor);
-                if (winMode === true) {
-                    setTimeout(function () {
-                        self.URL.revokeObjectURL(anchor.href);
-                    }, 250);
-                }
-            }, 66);
-            return true;
-        }
-
-        // handle non-a[download] safari as best we can:
-        if (
-            /(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent)
-        ) {
-            url = url.replace(/^data:([\w/\-+]+)/, defaultMime);
-            if (!window.open(url)) {
-                // popup blocked, offer direct download:
-                if (
-                    confirm(
-                        "Displaying New Document\n\nUse Save As... to download, then click back to return to this page."
-                    )
-                ) {
-                    location.href = url;
-                }
-            }
-            return true;
-        }
-
-        // do iframe dataURL download (old ch+FF):
-        var f = document.createElement("iframe");
-        document.body.appendChild(f);
-
-        if (!winMode) {
-            // force a mime that will download:
-            url = "data:" + url.replace(/^data:([\w/\-+]+)/, defaultMime);
-        }
-        f.src = url;
-        setTimeout(function () {
-            document.body.removeChild(f);
-        }, 333);
-    } // end saver
-
-    // @ts-ignore
-    if (navigator.msSaveBlob) {
-        // IE10+ : (has Blob, but not a[download] or URL)
-        // @ts-ignore
-        return navigator.msSaveBlob(blob, fileName);
-    }
-
-    if (self.URL) {
-        // simple fast and modern way using Blob and URL:
-        saver(self.URL.createObjectURL(blob), true);
-    } else {
-        // handle non-Blob()+non-URL browsers:
-        if (typeof blob === "string" || blob.constructor === toString) {
-            try {
-                // @ts-ignore
-                return saver("data:" + mimeType + ";base64," + self.btoa(blob));
-            } catch (y) {
-                // @ts-ignore
-                return saver("data:" + mimeType + "," + encodeURIComponent(blob));
-            }
-        }
-
-        // Blob but not URL support:
-        reader = new FileReader();
-        reader.onload = function (e) {
-            // @ts-ignore
-            saver(this.result);
-        };
-        reader.readAsDataURL(blob);
-    }
-    return true;
+	var self = window;
+	// this script is only for browsers anyway...
+
+	var defaultMime = "application/octet-stream";
+	// this default mime also triggers iframe downloads
+
+	var mimeType = strMimeType || defaultMime;
+
+	var payload = data;
+
+	var url = !strFileName && !strMimeType && payload;
+
+	var anchor = document.createElement("a");
+
+	var toString = function (a) {
+		return String(a);
+	};
+
+	// @ts-ignore
+	var myBlob = self.Blob || self.MozBlob || self.WebKitBlob || toString;
+
+	var fileName = strFileName || "download";
+
+	var blob;
+
+	var reader;
+	myBlob = myBlob.call ? myBlob.bind(self) : Blob;
+
+	if (String(this) === "true") {
+		// reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
+		payload = [payload, mimeType];
+		mimeType = payload[0];
+		payload = payload[1];
+	}
+
+	if (url && url.length < 2048) {
+		// if no filename and no mime, assume a url was passed as the only argument
+		fileName = url.split("/").pop().split("?")[0];
+		anchor.href = url; // assign href prop to temp anchor
+
+		// if the browser determines that it's a potentially valid url path:
+		if (
+				anchor.href.indexOf(url) !== -1 ||
+				anchor.href.indexOf(encodeURI(url)) !== -1 ||
+				anchor.href === encodeURI(url)
+		) {
+			var ajax = new XMLHttpRequest();
+			ajax.open("GET", url + "?no-cache=" + Date.now(), true);
+			ajax.responseType = "blob";
+			ajax.onload = function (e) {
+				// @ts-ignore
+				download(e.target.response, fileName, defaultMime);
+			};
+			ajax.onerror = function (e) {
+				// As a fallback, just open the request in a new tab
+				window.open(url, "_blank").focus();
+			};
+			setTimeout(function () {
+				ajax.send();
+			}, 0); // allows setting custom ajax headers using the return:
+			return ajax;
+		} else {
+			throw new Error("Invalid URL given, cannot download file: " + url);
+		}
+	} // end if url?
+
+	// go ahead and download dataURLs right away
+	if (/^data:[\w+-]+\/[\w+-]+[,;]/.test(payload)) {
+		if (payload.length > 1024 * 1024 * 1.999 && myBlob !== toString) {
+			payload = dataUrlToBlob(payload);
+			mimeType = payload.type || defaultMime;
+		} else {
+			// IE10 can't do a[download], only Blobs
+			// everyone else can save dataURLs un-processed
+			// @ts-ignore
+			return navigator.msSaveBlob ? navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : saver(payload);
+		}
+	} // end if dataURL passed?
+
+	blob =
+			payload instanceof myBlob
+					? payload
+					: new myBlob([payload], { type: mimeType });
+
+	function dataUrlToBlob(strUrl) {
+		var parts = strUrl.split(/[:;,]/);
+
+		var type = parts[1];
+
+		var decoder = parts[2] === "base64" ? atob : decodeURIComponent;
+
+		var binData = decoder(parts.pop());
+
+		var mx = binData.length;
+
+		var i = 0;
+
+		var uiArr = new Uint8Array(mx);
+
+		for (i; i < mx; ++i) uiArr[i] = binData.charCodeAt(i);
+
+		return new myBlob([uiArr], { type: type });
+	}
+
+	function saver(url, winMode) {
+		if ("download" in anchor) {
+			// html5 A[download]
+			anchor.href = url;
+			anchor.setAttribute("download", fileName);
+			anchor.className = "download-js-link";
+			anchor.innerHTML = "downloading...";
+			anchor.style.display = "none";
+			anchor.target = "_blank";
+			document.body.appendChild(anchor);
+			setTimeout(function () {
+				anchor.click();
+				document.body.removeChild(anchor);
+				if (winMode === true) {
+					setTimeout(function () {
+						self.URL.revokeObjectURL(anchor.href);
+					}, 250);
+				}
+			}, 66);
+			return true;
+		}
+
+		// handle non-a[download] safari as best we can:
+		if (
+				/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent)
+		) {
+			url = url.replace(/^data:([\w/\-+]+)/, defaultMime);
+			if (!window.open(url)) {
+				// popup blocked, offer direct download:
+				if (
+						confirm(
+								"Displaying New Document\n\nUse Save As... to download, then click back to return to this page."
+						)
+				) {
+					location.href = url;
+				}
+			}
+			return true;
+		}
+
+		// do iframe dataURL download (old ch+FF):
+		var f = document.createElement("iframe");
+		document.body.appendChild(f);
+
+		if (!winMode) {
+			// force a mime that will download:
+			url = "data:" + url.replace(/^data:([\w/\-+]+)/, defaultMime);
+		}
+		f.src = url;
+		setTimeout(function () {
+			document.body.removeChild(f);
+		}, 333);
+	} // end saver
+
+	// @ts-ignore
+	if (navigator.msSaveBlob) {
+		// IE10+ : (has Blob, but not a[download] or URL)
+		// @ts-ignore
+		return navigator.msSaveBlob(blob, fileName);
+	}
+
+	if (self.URL) {
+		// simple fast and modern way using Blob and URL:
+		saver(self.URL.createObjectURL(blob), true);
+	} else {
+		// handle non-Blob()+non-URL browsers:
+		if (typeof blob === "string" || blob.constructor === toString) {
+			try {
+				// @ts-ignore
+				return saver("data:" + mimeType + ";base64," + self.btoa(blob));
+			} catch (y) {
+				// @ts-ignore
+				return saver("data:" + mimeType + "," + encodeURIComponent(blob));
+			}
+		}
+
+		// Blob but not URL support:
+		reader = new FileReader();
+		reader.onload = function (e) {
+			// @ts-ignore
+			saver(this.result);
+		};
+		reader.readAsDataURL(blob);
+	}
+	return true;
 }