diff options
author | Melissa Zhang <mzhang19096@gmail.com> | 2020-08-12 10:45:40 -0700 |
---|---|---|
committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-08-12 10:45:40 -0700 |
commit | 7e2bece0dc01363932ea603da8c2326186681e0c (patch) | |
tree | cfcf9badfe77eb5a514b58abd6ef269f0baea780 /src/client/DocServer.ts | |
parent | e8a697bfc45b5eefeaf1585973e5d11a8c965068 (diff) | |
parent | f9c189d6a602e0b0d9f342e72aed70bd894efe5e (diff) |
merge with master
Diffstat (limited to 'src/client/DocServer.ts')
-rw-r--r-- | src/client/DocServer.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts index 2fe3e9778..a36dfaf69 100644 --- a/src/client/DocServer.ts +++ b/src/client/DocServer.ts @@ -372,6 +372,9 @@ export namespace DocServer { } else if (cached instanceof Promise) { proms.push(cached as any); } + } else if (_cache[field.id] instanceof Promise) { + proms.push(_cache[field.id] as any); + (_cache[field.id] as any).then((f: any) => fieldMap[field.id] = f); } else if (field) { proms.push(_cache[field.id] as any); fieldMap[field.id] = field; |