From 6dd21d8ca48beef6d5054f60d04bb4412b6b33b5 Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Thu, 11 Apr 2019 17:16:46 -0400
Subject: Fixed another subtle server related bug Added optional capturing to
 scripts

---
 src/client/SocketStub.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/client/SocketStub.ts')

diff --git a/src/client/SocketStub.ts b/src/client/SocketStub.ts
index 257973e3d..5e2ca6a98 100644
--- a/src/client/SocketStub.ts
+++ b/src/client/SocketStub.ts
@@ -62,10 +62,13 @@ export class SocketStub {
     public static SEND_FIELDS_REQUEST(fieldIds: FieldId[], callback: (fields: FieldMap) => any) {
         Utils.EmitCallback(Server.Socket, MessageStore.GetFields, fieldIds, (fields: any[]) => {
             let fieldMap: any = {};
+            let proms: Promise<any>[] = [];
             for (let field of fields) {
-                fieldMap[field._id] = ServerUtils.FromJson(field);
+                let f = ServerUtils.FromJson(field);
+                fieldMap[field._id] = f;
+                proms.push(new Promise(res => f.init(res)));
             }
-            callback(fieldMap);
+            Promise.all(proms).then(() => callback(fieldMap));
         });
     }
 
-- 
cgit v1.2.3-70-g09d2