diff options
| author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-01 18:40:10 -0400 |
|---|---|---|
| committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-01 18:40:10 -0400 |
| commit | 718070e6a627305cfff7575797e8eb4abb93714a (patch) | |
| tree | 5c0380e01f7ffa8cf19be504a26db6db04268756 | |
| parent | 9d862e53155fc5c97e748a9cfaf7f6833c911917 (diff) | |
Fixed most of video annotations
| -rw-r--r-- | src/client/DocServer.ts | 8 | ||||
| -rw-r--r-- | src/client/util/SerializationHelper.ts | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts index 1d73abd1f..8e9f7865b 100644 --- a/src/client/DocServer.ts +++ b/src/client/DocServer.ts @@ -22,8 +22,8 @@ export namespace DocServer { let cached = _cache[id]; if (cached === undefined) { const prom = Utils.EmitCallback(_socket, MessageStore.GetRefField, id).then(fieldJson => { - const field = fieldJson === undefined ? fieldJson : SerializationHelper.Deserialize(fieldJson); - if (field) { + const field = SerializationHelper.Deserialize(fieldJson); + if (field !== undefined) { _cache[id] = field; } else { delete _cache[id]; @@ -58,7 +58,7 @@ export namespace DocServer { const prom = Utils.EmitCallback(_socket, MessageStore.GetRefFields, requestedIds).then(fields => { const fieldMap: { [id: string]: RefField } = {}; for (const field of fields) { - if (field) { + if (field !== undefined) { fieldMap[field.id] = SerializationHelper.Deserialize(field); } } @@ -68,7 +68,7 @@ export namespace DocServer { const fields = await prom; requestedIds.forEach(id => { const field = fields[id]; - if (field) { + if (field !== undefined) { _cache[id] = field; } else { delete _cache[id]; diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts index b5873eeb3..7ded85e43 100644 --- a/src/client/util/SerializationHelper.ts +++ b/src/client/util/SerializationHelper.ts @@ -8,8 +8,8 @@ export namespace SerializationHelper { } export function Serialize(obj: Field): any { - if (!obj) { - return null; + if (obj === undefined || obj === null) { + return undefined; } if (typeof obj !== 'object') { @@ -28,8 +28,8 @@ export namespace SerializationHelper { } export function Deserialize(obj: any): any { - if (!obj) { - return null; + if (obj === undefined || obj === null) { + return undefined; } if (typeof obj !== 'object') { |