Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into propsRefactor

2 files changed, 8 insertions, 4 deletions

diff --git a/src/client/views/nodes/KeyValueBox.tsx b/src/client/views/nodes/KeyValueBox.tsx
index 9958a7c5a..8a7f32e6d 100644
--- a/src/client/views/nodes/KeyValueBox.tsx
+++ b/src/client/views/nodes/KeyValueBox.tsx
@@ -40,11 +40,13 @@ export class KeyValueBox extends React.Component<FieldViewProps> {
                 }
                 let realDoc = doc;
 
-                let script = CompileScript(this._valueInput, undefined, true);
+                let script = CompileScript(this._valueInput, { addReturn: true });
                 if (!script.compiled) {
                     return;
                 }
-                let field = script();
+                let res = script.run();
+                if (!res.success) return;
+                const field = res.result;
                 if (field instanceof Field) {
                     realDoc.Set(new Key(this._keyInput), field);
                 } else {
diff --git a/src/client/views/nodes/KeyValuePair.tsx b/src/client/views/nodes/KeyValuePair.tsx
index a676844dc..c6a0a7296 100644
--- a/src/client/views/nodes/KeyValuePair.tsx
+++ b/src/client/views/nodes/KeyValuePair.tsx
@@ -81,11 +81,13 @@ export class KeyValuePair extends React.Component<KeyValuePairProps> {
                     return field || "";
                 }}
                     SetValue={(value: string) => {
-                        let script = CompileScript(value, undefined, true);
+                        let script = CompileScript(value, { addReturn: true });
                         if (!script.compiled) {
                             return false;
                         }
-                        let field = script();
+                        let res = script.run();
+                        if (!res.success) return false;
+                        const field = res.result;
                         if (field instanceof Field) {
                             props.Document.Set(props.fieldKey, field);
                             return true;