1 files changed, 19 insertions, 10 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 56b97e42f..7170be6cc 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -853,16 +853,24 @@ export namespace Doc {
     export async function Zip(doc: Doc, zipFilename = 'dashExport.zip') {
         const { clone, map, linkMap } = await Doc.MakeClone(doc);
         const proms = new Set<string>();
-        function replacer(key: any, value: any) {
+        function replacer(key: any, value: any) {            
             if (key && ['branchOf', 'cloneOf', 'cursors'].includes(key)) return undefined;
-            if (value instanceof ImageField) {
-                const extension = value.url.href.replace(/.*\./, '');
-                proms.add(value.url.href.replace('.' + extension, '_o.' + extension));
-                return SerializationHelper.Serialize(value);
+            if (value?.__type  === 'image') {
+                const extension = value.url.replace(/.*\./, '');
+                proms.add(value.url.replace('.' + extension, '_o.' + extension));
+                return SerializationHelper.Serialize(new ImageField(value.url));
             }
-            if (value instanceof PdfField || value instanceof AudioField || value instanceof VideoField) {
-                proms.add(value.url.href);
-                return SerializationHelper.Serialize(value);
+            if (value?.__type  === 'pdf') {
+                proms.add(value.url);
+                return SerializationHelper.Serialize(new PdfField(value.url));
+            }
+            if (value?.__type  === 'audio') {
+                proms.add(value.url);
+                return SerializationHelper.Serialize(new AudioField(value.url));
+            }
+            if (value?.__type  === 'video') {
+                proms.add(value.url);
+                return SerializationHelper.Serialize(new VideoField(value.url));
             }
             if (
                 value instanceof Doc ||
@@ -889,14 +897,15 @@ export namespace Doc {
 
         const zip = new JSZip();
         var count = 0;
-        const promArr = Array.from(proms).filter(url => url.startsWith(window.location.origin));
+        const promArr = Array.from(proms).filter(url => url?.startsWith("/files")).map(url => url.replace("/",""))// window.location.origin));
+        console.log(promArr.length);
         if (!promArr.length) {
             zip.file('docs.json', jsonDocs);
             zip.generateAsync({ type: 'blob' }).then(content => saveAs(content, zipFilename));
         } else
             promArr.forEach((url, i) => {
                 // loading a file and add it in a zip file
-                JSZipUtils.getBinaryContent(url, (err: any, data: any) => {
+                JSZipUtils.getBinaryContent(window.location.origin+"/"+url, (err: any, data: any) => {
                     if (err) throw err; // or handle the error
                     // // Generate a directory within the Zip file structure
                     // const assets = zip.folder("assets");