1 files changed, 30 insertions, 8 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index a288d394a..f1b50d5a0 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -1,7 +1,7 @@
 import * as OpenSocket from 'socket.io-client';
 import { MessageStore } from "./../server/Message";
 import { Opt } from '../new_fields/Doc';
-import { Utils } from '../Utils';
+import { Utils, emptyFunction } from '../Utils';
 import { SerializationHelper } from './util/SerializationHelper';
 import { RefField, HandleUpdate, Id } from '../new_fields/RefField';
 
@@ -10,6 +10,12 @@ export namespace DocServer {
     const _socket = OpenSocket(`${window.location.protocol}//${window.location.hostname}:4321`);
     const GUID: string = Utils.GenerateGuid();
 
+    export function makeReadOnly() {
+        _CreateField = emptyFunction;
+        _UpdateField = emptyFunction;
+        _respondToUpdate = emptyFunction;
+    }
+
     export function prepend(extension: string): string {
         return window.location.origin + extension;
     }
@@ -21,12 +27,10 @@ export namespace DocServer {
     export async function GetRefField(id: string): Promise<Opt<RefField>> {
         let cached = _cache[id];
         if (cached === undefined) {
-            const prom = Utils.EmitCallback(_socket, MessageStore.GetRefField, id).then(fieldJson => {
+            const prom = Utils.EmitCallback(_socket, MessageStore.GetRefField, id).then(async fieldJson => {
                 const field = SerializationHelper.Deserialize(fieldJson);
-                if (_cache[id] !== undefined && !(_cache[id] instanceof Promise)) {
-                    id;
-                }
                 if (field !== undefined) {
+                    await field.proto;
                     _cache[id] = field;
                 } else {
                     delete _cache[id];
@@ -65,6 +69,7 @@ export namespace DocServer {
                     fieldMap[field.id] = SerializationHelper.Deserialize(field);
                 }
             }
+
             return fieldMap;
         });
         requestedIds.forEach(id => _cache[id] = prom.then(fields => fields[id]));
@@ -78,26 +83,40 @@ export namespace DocServer {
             }
             map[id] = field;
         });
+        await Promise.all(requestedIds.map(async id => {
+            const field = fields[id];
+            if (field) {
+                await (field as any).proto;
+            }
+        }));
         const otherFields = await Promise.all(promises);
         waitingIds.forEach((id, index) => map[id] = otherFields[index]);
         return map;
     }
 
-    export function UpdateField(id: string, diff: any) {
+    let _UpdateField = (id: string, diff: any) => {
         if (id === updatingId) {
             return;
         }
         Utils.Emit(_socket, MessageStore.UpdateField, { id, diff });
+    };
+
+    export function UpdateField(id: string, diff: any) {
+        _UpdateField(id, diff);
     }
 
-    export function CreateField(field: RefField) {
+    let _CreateField = (field: RefField) => {
         _cache[field[Id]] = field;
         const initialState = SerializationHelper.Serialize(field);
         Utils.Emit(_socket, MessageStore.CreateField, initialState);
+    };
+
+    export function CreateField(field: RefField) {
+        _CreateField(field);
     }
 
     let updatingId: string | undefined;
-    function respondToUpdate(diff: any) {
+    let _respondToUpdate = (diff: any) => {
         const id = diff.id;
         if (id === undefined) {
             return;
@@ -119,6 +138,9 @@ export namespace DocServer {
         } else {
             update(field);
         }
+    };
+    function respondToUpdate(diff: any) {
+        _respondToUpdate(diff);
     }
 
     function connected() {