Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

2 files changed, 26 insertions, 25 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index d231f42e8..e3cc8ccfe 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -180,7 +180,7 @@ export namespace Docs {
         };
         type TemplateMap = Map<DocumentType, PrototypeTemplate>;
         type PrototypeMap = Map<DocumentType, Doc>;
-        const data = "data";
+        const defaultDataKey = "data";
 
         const TemplateMap: TemplateMap = new Map([
             [DocumentType.RTF, {
@@ -188,97 +188,97 @@ export namespace Docs {
                 options: { _height: 150, _xMargin: 10, _yMargin: 10 }
             }],
             [DocumentType.QUERY, {
-                layout: { view: QueryBox, dataField: data },
+                layout: { view: QueryBox, dataField: defaultDataKey },
                 options: { _width: 400 }
             }],
             [DocumentType.COLOR, {
-                layout: { view: ColorBox, dataField: data },
+                layout: { view: ColorBox, dataField: defaultDataKey },
                 options: { _nativeWidth: 220, _nativeHeight: 300 }
             }],
             [DocumentType.IMG, {
-                layout: { view: ImageBox, dataField: data },
+                layout: { view: ImageBox, dataField: defaultDataKey },
                 options: {}
             }],
             [DocumentType.WEB, {
-                layout: { view: WebBox, dataField: data },
+                layout: { view: WebBox, dataField: defaultDataKey },
                 options: { _height: 300 }
             }],
             [DocumentType.COL, {
-                layout: { view: CollectionView, dataField: data },
+                layout: { view: CollectionView, dataField: defaultDataKey },
                 options: { _panX: 0, _panY: 0, scale: 1 } // , _width: 500, _height: 500 }
             }],
             [DocumentType.KVP, {
-                layout: { view: KeyValueBox, dataField: data },
+                layout: { view: KeyValueBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.DOCHOLDER, {
-                layout: { view: DocHolderBox, dataField: data },
+                layout: { view: DocHolderBox, dataField: defaultDataKey },
                 options: { _height: 250 }
             }],
             [DocumentType.VID, {
-                layout: { view: VideoBox, dataField: data },
+                layout: { view: VideoBox, dataField: defaultDataKey },
                 options: { currentTimecode: 0 },
             }],
             [DocumentType.AUDIO, {
-                layout: { view: AudioBox, dataField: data },
+                layout: { view: AudioBox, dataField: defaultDataKey },
                 options: { _height: 35, backgroundColor: "lightGray" }
             }],
             [DocumentType.PDF, {
-                layout: { view: PDFBox, dataField: data },
+                layout: { view: PDFBox, dataField: defaultDataKey },
                 options: { curPage: 1 }
             }],
             [DocumentType.IMPORT, {
-                layout: { view: DirectoryImportBox, dataField: data },
+                layout: { view: DirectoryImportBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.LINK, {
-                layout: { view: LinkBox, dataField: data },
+                layout: { view: LinkBox, dataField: defaultDataKey },
                 options: { _height: 150 }
             }],
             [DocumentType.LINKDB, {
                 data: new List<Doc>(),
-                layout: { view: EmptyBox, dataField: data },
+                layout: { view: EmptyBox, dataField: defaultDataKey },
                 options: { childDropAction: "alias", title: "Global Link Database" }
             }],
             [DocumentType.SCRIPTING, {
-                layout: { view: ScriptingBox, dataField: data }
+                layout: { view: ScriptingBox, dataField: defaultDataKey }
             }],
             [DocumentType.YOUTUBE, {
-                layout: { view: YoutubeBox, dataField: data }
+                layout: { view: YoutubeBox, dataField: defaultDataKey }
             }],
             [DocumentType.LABEL, {
-                layout: { view: LabelBox, dataField: data },
+                layout: { view: LabelBox, dataField: defaultDataKey },
             }],
             [DocumentType.BUTTON, {
                 layout: { view: LabelBox, dataField: "onClick" },
             }],
             [DocumentType.SLIDER, {
-                layout: { view: SliderBox, dataField: data },
+                layout: { view: SliderBox, dataField: defaultDataKey },
             }],
             [DocumentType.PRES, {
-                layout: { view: PresBox, dataField: data },
+                layout: { view: PresBox, dataField: defaultDataKey },
                 options: {}
             }],
             [DocumentType.FONTICON, {
-                layout: { view: FontIconBox, dataField: data },
+                layout: { view: FontIconBox, dataField: defaultDataKey },
                 options: { _width: 40, _height: 40, borderRounding: "100%" },
             }],
             [DocumentType.RECOMMENDATION, {
-                layout: { view: RecommendationsBox, dataField: data },
+                layout: { view: RecommendationsBox, dataField: defaultDataKey },
                 options: { _width: 200, _height: 200 },
             }],
             [DocumentType.WEBCAM, {
-                layout: { view: DashWebRTCVideo, dataField: data }
+                layout: { view: DashWebRTCVideo, dataField: defaultDataKey }
             }],
             [DocumentType.PRESELEMENT, {
-                layout: { view: PresElementBox, dataField: data }
+                layout: { view: PresElementBox, dataField: defaultDataKey }
             }],
             [DocumentType.INK, {
-                layout: { view: InkingStroke, dataField: data },
+                layout: { view: InkingStroke, dataField: defaultDataKey },
                 options: { backgroundColor: "transparent" }
             }],
             [DocumentType.SCREENSHOT, {
-                layout: { view: ScreenshotBox, dataField: data },
+                layout: { view: ScreenshotBox, dataField: defaultDataKey },
             }],
         ]);
 
diff --git a/src/server/database.ts b/src/server/database.ts
index d74bd7321..ad285765b 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -52,6 +52,7 @@ export namespace Database {
         private currentWrites: { [id: string]: Promise<void> } = {};
         private db?: mongodb.Db;
         private onConnect: (() => void)[] = [];
+
         doConnect() {
             console.error(`\nConnecting to Mongo with URL : ${url}\n`);
             this.MongoClient.connect(url, { connectTimeoutMS: 30000, socketTimeoutMS: 30000, useUnifiedTopology: true }, (_err, client) => {