Merge branch 'master' of github.com:brown-dash/Dash-Web into master

1 files changed, 8 insertions, 8 deletions

diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts
index 4896c027d..b23732b45 100644
--- a/src/fields/ScriptField.ts
+++ b/src/fields/ScriptField.ts
@@ -6,11 +6,10 @@ import { scriptingGlobal, ScriptingGlobals } from '../client/util/ScriptingGloba
 import { autoObject, Deserializable } from '../client/util/SerializationHelper';
 import { numberRange } from '../Utils';
 import { Doc, Field, Opt } from './Doc';
-import { Copy, Id, ToScriptString, ToString } from './FieldSymbols';
+import { Copy, Id, ToScriptString, ToString, ToValue } from './FieldSymbols';
 import { List } from './List';
 import { ObjectField } from './ObjectField';
 import { Cast, StrCast } from './Types';
-import { Plugins } from './util';
 
 function optional(propSchema: PropSchema) {
     return custom(
@@ -175,6 +174,9 @@ export class ComputedField extends ScriptField {
     value = computedFn((doc: Doc) => this._valueOutsideReaction(doc));
     _valueOutsideReaction = (doc: Doc) => (this._lastComputedResult = this.script.run({ this: doc, self: Cast(doc.rootDocument, Doc, null) || doc, _last_: this._lastComputedResult, _readOnly_: true }, console.log).result);
 
+    [ToValue](doc: Doc) {
+        return ComputedField.toValue(doc, this);
+    }
     [Copy](): ObjectField {
         return new ComputedField(this.script, this.setterscript, this.rawscript);
     }
@@ -239,12 +241,10 @@ export namespace ComputedField {
         }
     }
 
-    export function initPlugin() {
-        Plugins.addGetterPlugin((doc, _, value) => {
-            if (useComputed && value instanceof ComputedField) {
-                return { value: value._valueOutsideReaction(doc), shouldReturn: true };
-            }
-        });
+    export function toValue(doc: any, value: any) {
+        if (useComputed) {
+            return { value: value._valueOutsideReaction(doc) };
+        }
     }
 }