diff options
| author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-08-08 16:15:22 -0400 |
|---|---|---|
| committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-08-08 16:15:22 -0400 |
| commit | 68f613b5e762649b743059e494e9307eb103ff0d (patch) | |
| tree | 10aed3f36b3b006ae83ecbfc1be661d873d6b95d /src/new_fields | |
| parent | 316c241d72fb83aad5f2bf9b143c317fdc906654 (diff) | |
Fixed per field write modes
Diffstat (limited to 'src/new_fields')
| -rw-r--r-- | src/new_fields/Doc.ts | 12 | ||||
| -rw-r--r-- | src/new_fields/util.ts | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts index ba01cfd9c..87e048140 100644 --- a/src/new_fields/Doc.ts +++ b/src/new_fields/Doc.ts @@ -148,7 +148,7 @@ export class Doc extends RefField { return "invalid"; } - private [CachedUpdates]: { [key: string]: () => Promise<any> } = {}; + private [CachedUpdates]: { [key: string]: () => void | Promise<any> } = {}; public async [HandleUpdate](diff: any) { const set = diff.$set; @@ -178,7 +178,7 @@ export class Doc extends RefField { continue; } const fKey = key.substring(7); - const fn = async () => { + const fn = () => { updatingFromServer = true; delete this[fKey]; updatingFromServer = false; @@ -211,6 +211,14 @@ export namespace Doc { delete doc[CachedUpdates][field]; } } + export function AddCachedUpdate(doc: Doc, field: string, oldValue: any) { + const val = oldValue; + doc[CachedUpdates][field] = () => { + updatingFromServer = true; + doc[field] = val; + updatingFromServer = false; + }; + } export function MakeReadOnly(): { end(): void } { makeReadOnly(); return { diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts index 099fe2d0a..6c05da507 100644 --- a/src/new_fields/util.ts +++ b/src/new_fields/util.ts @@ -70,7 +70,7 @@ const _setterImpl = action(function (target: any, prop: string | symbol | number if (value === undefined) target[Update]({ '$unset': { ["fields." + prop]: "" } }); else target[Update]({ '$set': { ["fields." + prop]: value instanceof ObjectField ? SerializationHelper.Serialize(value) : (value === undefined ? null : value) } }); } else { - DocServer.registerDocWithCachedUpdate(receiver, prop as string); + DocServer.registerDocWithCachedUpdate(receiver, prop as string, curValue); } UndoManager.AddEvent({ redo: () => receiver[prop] = value, |