From 411a453970d96b145875031ffbecbee9461162fb Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Fri, 7 Jun 2019 11:18:28 -0400
Subject: fixes for computed script deserialization

---
 src/fields/ScriptField.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/fields')

diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts
index 05ed57ea5..ac46ccf90 100644
--- a/src/fields/ScriptField.ts
+++ b/src/fields/ScriptField.ts
@@ -44,14 +44,14 @@ export class ScriptField extends ObjectField {
         this._script = script;
     }
 
-    @serializable(object(optionsSchema))
+    @serializable(custom(object(optionsSchema).serializer, () => SKIP))
     get options() {
-        return this._script.options;
+        return this._script && this._script.options;
     }
 
-    @serializable(true)
+    @serializable(custom(primitive().serializer, () => SKIP))
     get scriptString(): string {
-        return this._script.originalScript;
+        return this._script && this._script.originalScript;
     }
 
     //     init(callback: (res: Field) => any) {
@@ -84,7 +84,7 @@ export class ScriptField extends ObjectField {
     }
 }
 
-@Deserializable("computed")
+@Deserializable("computed", deserializeScript)
 export class ComputedField extends ScriptField {
     @computed
     get value() {
-- 
cgit v1.2.3-70-g09d2