diff options
| author | bob <bcz@cs.brown.edu> | 2019-05-21 12:35:38 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-05-21 12:35:38 -0400 |
| commit | a8717e39df75cbd1fd13435ee9028f230a833399 (patch) | |
| tree | a17bf828e79e0f20ceb55546915d0bf4be41928e /src/client/views/nodes/KeyValuePair.tsx | |
| parent | 7bafa21e8c37826686a012151674b71631fa9c8b (diff) | |
| parent | cfb7fdb1a7b2db263502677e57ee882a6fe23f13 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/nodes/KeyValuePair.tsx')
| -rw-r--r-- | src/client/views/nodes/KeyValuePair.tsx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/client/views/nodes/KeyValuePair.tsx b/src/client/views/nodes/KeyValuePair.tsx index 7a88985c0..2363553df 100644 --- a/src/client/views/nodes/KeyValuePair.tsx +++ b/src/client/views/nodes/KeyValuePair.tsx @@ -60,10 +60,8 @@ export class KeyValuePair extends React.Component<KeyValuePairProps> { <EditableView contents={contents} height={36} GetValue={() => { let field = FieldValue(props.Document[props.fieldKey]); - if (field) { - //TODO Types - return String(field); - // return field.ToScriptString(); + if (Field.IsField(field)) { + return Field.toScriptString(field); } return ""; }} @@ -75,7 +73,7 @@ export class KeyValuePair extends React.Component<KeyValuePairProps> { let res = script.run(); if (!res.success) return false; const field = res.result; - if (Field.IsField(field)) { + if (Field.IsField(field, true)) { props.Document[props.fieldKey] = field; return true; } |