Merge branch 'moreUpgrading' into dataViz-annotations

1 files changed, 24 insertions, 20 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 353e11775..6217cf04b 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -7,6 +7,7 @@ import { HandleUpdate, Id, Parent } from '../fields/FieldSymbols';
 import { ObjectField } from '../fields/ObjectField';
 import { RefField } from '../fields/RefField';
 import { DocCast, StrCast } from '../fields/Types';
+import { Socket } from '../../node_modules/socket.io/dist/index';
 //import MobileInkOverlay from '../mobile/MobileInkOverlay';
 import { emptyFunction, Utils } from '../Utils';
 import { GestureContent, MessageStore, MobileDocumentUploadContent, MobileInkOverlayContent, UpdateMobileInkOverlayPositionContent, YoutubeQueryTypes } from './../server/Message';
@@ -56,7 +57,7 @@ export namespace DocServer {
                 Doc.AddDocToList(Doc.MyRecentlyClosed, undefined, link);
             }
         });
-        LinkManager.userLinkDBs.forEach(linkDb => Doc.FindReferences(linkDb, references, undefined));
+        LinkManager.Instance.userLinkDBs.forEach(linkDb => Doc.FindReferences(linkDb, references, undefined));
         const filtered = Array.from(references);
 
         const newCacheUpdate = filtered.map(doc => doc[Id]).join(';');
@@ -76,7 +77,7 @@ export namespace DocServer {
             json: true,
         });
     }
-    export let _socket: SocketIOClient.Socket;
+    export let _socket: Socket;
     // this client's distinct GUID created at initialization
     let USER_ID: string;
     // indicates whether or not a document is currently being udpated, and, if so, its id
@@ -189,20 +190,20 @@ export namespace DocServer {
         Utils.AddServerHandler(_socket, MessageStore.DeleteFields, respondToDelete);
         Utils.AddServerHandler(_socket, MessageStore.ConnectionTerminated, alertUser);
 
-        // mobile ink overlay socket events to communicate between mobile view and desktop view
-        _socket.addEventListener('receiveGesturePoints', (content: GestureContent) => {
-            //   MobileInkOverlay.Instance.drawStroke(content);
-        });
-        _socket.addEventListener('receiveOverlayTrigger', (content: MobileInkOverlayContent) => {
-            //GestureOverlay.Instance.enableMobileInkOverlay(content);
-            //    MobileInkOverlay.Instance.initMobileInkOverlay(content);
-        });
-        _socket.addEventListener('receiveUpdateOverlayPosition', (content: UpdateMobileInkOverlayPositionContent) => {
-            //   MobileInkOverlay.Instance.updatePosition(content);
-        });
-        _socket.addEventListener('receiveMobileDocumentUpload', (content: MobileDocumentUploadContent) => {
-            //   MobileInkOverlay.Instance.uploadDocument(content);
-        });
+        // // mobile ink overlay socket events to communicate between mobile view and desktop view
+        // _socket.addEventListener('receiveGesturePoints', (content: GestureContent) => {
+        //     //   MobileInkOverlay.Instance.drawStroke(content);
+        // });
+        // _socket.addEventListener('receiveOverlayTrigger', (content: MobileInkOverlayContent) => {
+        //     //GestureOverlay.Instance.enableMobileInkOverlay(content);
+        //     //    MobileInkOverlay.Instance.initMobileInkOverlay(content);
+        // });
+        // _socket.addEventListener('receiveUpdateOverlayPosition', (content: UpdateMobileInkOverlayPositionContent) => {
+        //     //   MobileInkOverlay.Instance.updatePosition(content);
+        // });
+        // _socket.addEventListener('receiveMobileDocumentUpload', (content: MobileDocumentUploadContent) => {
+        //     //   MobileInkOverlay.Instance.uploadDocument(content);
+        // });
     }
 
     function errorFunc(): never {
@@ -470,10 +471,13 @@ export namespace DocServer {
         // to their actual RefField | undefined values. This return value either becomes the input
         // argument to the caller's promise (i.e. GetRefFields(["_id1_", "_id2_", "_id3_"]).then(map => //do something with map...))
         // or it is the direct return result if the promise is awaited (i.e. let fields = await GetRefFields(["_id1_", "_id2_", "_id3_"])).
-        return ids.reduce((map, id) => {
-            map[id] = _cache[id] as any;
-            return map;
-        }, {} as { [id: string]: Opt<RefField> });
+        return ids.reduce(
+            (map, id) => {
+                map[id] = _cache[id] as any;
+                return map;
+            },
+            {} as { [id: string]: Opt<RefField> }
+        );
     };
 
     let _GetRefFields: (ids: string[]) => Promise<{ [id: string]: Opt<RefField> }> = errorFunc;