1 files changed, 10 insertions, 9 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 929660ff4..4ec100728 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -30,7 +30,6 @@ import { DimUnit } from '../views/collections/collectionMulticolumn/CollectionMu
 import { CollectionView } from '../views/collections/CollectionView';
 import { ContextMenu } from '../views/ContextMenu';
 import { ContextMenuProps } from '../views/ContextMenuItem';
-import { DFLT_IMAGE_NATIVE_DIM } from '../views/global/globalCssVariables.scss';
 import { ActiveArrowEnd, ActiveArrowStart, ActiveDash, ActiveFillColor, ActiveInkBezierApprox, ActiveInkColor, ActiveInkWidth, ActiveIsInkMask, InkingStroke } from '../views/InkingStroke';
 import { AudioBox, media_state } from '../views/nodes/AudioBox';
 import { ColorBox } from '../views/nodes/ColorBox';
@@ -61,6 +60,8 @@ import { VideoBox } from '../views/nodes/VideoBox';
 import { WebBox } from '../views/nodes/WebBox';
 import { SearchBox } from '../views/search/SearchBox';
 import { CollectionViewType, DocumentType } from './DocumentTypes';
+//import { DFLT_IMAGE_NATIVE_DIM } from '../views/global/globalCssVariables.scss';
+const DFLT_IMAGE_NATIVE_DIM = '900px';
 
 const defaultNativeImageDim = Number(DFLT_IMAGE_NATIVE_DIM.replace('px', ''));
 class EmptyBox {
@@ -1299,7 +1300,7 @@ export namespace DocUtils {
             // links are not a field value, so handled here.  value is an expression of form ([field=]idToDoc("..."))
             const allLinks = LinkManager.Instance.getAllRelatedLinks(doc);
             const matchLink = (value: string, anchor: Doc) => {
-                const linkedToExp = value?.split('=');
+                const linkedToExp = (value ?? '').split('=');
                 if (linkedToExp.length === 1) return Field.toScriptString(anchor) === value;
                 return Field.toScriptString(DocCast(anchor[linkedToExp[0]])) === linkedToExp[1];
             };
@@ -1909,7 +1910,7 @@ export namespace DocUtils {
         const generatedDocuments: Doc[] = [];
         Networking.UploadYoutubeToServer(videoId, overwriteDoc?.[Id]).then(upfiles => {
             const {
-                source: { name, type },
+                source: { newFilename, originalFilename, mimetype },
                 result,
             } = upfiles.lastElement();
             if ((result as any).message) {
@@ -1918,7 +1919,7 @@ export namespace DocUtils {
                     overwriteDoc.loadingError = (result as any).message;
                     LoadingBox.removeCurrentlyLoading(overwriteDoc);
                 }
-            } else name && processFileupload(generatedDocuments, name, type, result, options, overwriteDoc);
+            } else newFilename && processFileupload(generatedDocuments, newFilename, mimetype ?? '', result, options, overwriteDoc);
         });
     }
 
@@ -1938,10 +1939,10 @@ export namespace DocUtils {
 
         const upfiles = await Networking.UploadFilesToServer(fileNoGuidPairs);
         for (const {
-            source: { name, type },
+            source: { newFilename, mimetype },
             result,
         } of upfiles) {
-            name && type && processFileupload(generatedDocuments, name, type, result, options);
+            newFilename && mimetype && processFileupload(generatedDocuments, newFilename, mimetype, result, options);
         }
         return generatedDocuments;
     }
@@ -1951,15 +1952,15 @@ export namespace DocUtils {
         // Since this file has an overwriteDoc, we can set the client tracking guid to the overwriteDoc's guid.
         Networking.UploadFilesToServer([{ file, guid: overwriteDoc[Id] }]).then(upfiles => {
             const {
-                source: { name, type },
+                source: { newFilename, mimetype },
                 result,
-            } = upfiles.lastElement() ?? { source: { name: '', type: '' }, result: { message: 'upload failed' } };
+            } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: { message: 'upload failed' } };
             if ((result as any).message) {
                 if (overwriteDoc) {
                     overwriteDoc.loadingError = (result as any).message;
                     LoadingBox.removeCurrentlyLoading(overwriteDoc);
                 }
-            } else name && type && processFileupload(generatedDocuments, name, type, result, options, overwriteDoc);
+            } else newFilename && mimetype && processFileupload(generatedDocuments, newFilename, mimetype, result, options, overwriteDoc);
         });
     }