From 503cae6db116a680fba7bdd530ae30b7b3c495a4 Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Tue, 31 Mar 2020 14:25:25 -0400 Subject: cleaned up some code very slightly --- src/new_fields/Doc.ts | 7 ++++--- src/new_fields/util.ts | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/new_fields') diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts index 8110130b0..7fb17c788 100644 --- a/src/new_fields/Doc.ts +++ b/src/new_fields/Doc.ts @@ -883,9 +883,10 @@ export namespace Doc { } const options = optionsCollection as Doc; const targetDoc = doc && Doc.GetProto(Cast(doc.rootDocument, Doc, null) || doc); - targetDoc && (targetDoc.backgroundColor = ComputedField.MakeFunction(`options.data.find(doc => doc.title === (this.rootDocument||this)["${enumeratedFieldKey}"])?._backgroundColor || "white"`, undefined, { options })); - targetDoc && (targetDoc.color = ComputedField.MakeFunction(`options.data.find(doc => doc.title === (this.rootDocument||this)["${enumeratedFieldKey}"]).color || "black"`, undefined, { options })); - targetDoc && (targetDoc.borderRounding = ComputedField.MakeFunction(`options.data.find(doc => doc.title === (this.rootDocument||this)["${enumeratedFieldKey}"]).borderRounding`, undefined, { options })); + const docFind = `options.data.find(doc => doc.title === (this.rootDocument||this)["${enumeratedFieldKey}"])?`; + targetDoc && (targetDoc.backgroundColor = ComputedField.MakeFunction(docFind + `._backgroundColor || "white"`, undefined, { options })); + targetDoc && (targetDoc.color = ComputedField.MakeFunction(docFind + `.color || "black"`, undefined, { options })); + targetDoc && (targetDoc.borderRounding = ComputedField.MakeFunction(docFind + `.borderRounding`, undefined, { options })); enumerations.map(enumeration => { const found = DocListCast(options.data).find(d => d.title === enumeration.title); if (found) { diff --git a/src/new_fields/util.ts b/src/new_fields/util.ts index 3ab1b299b..3a1fd41f8 100644 --- a/src/new_fields/util.ts +++ b/src/new_fields/util.ts @@ -12,8 +12,9 @@ function _readOnlySetter(): never { throw new Error("Documents can't be modified in read-only mode"); } +let tracing = false; export function TraceMobx() { - // trace(); + tracing && trace(); } export interface GetterResult { -- cgit v1.2.3-70-g09d2