diff options
author | Melissa Zhang <mzhang19096@gmail.com> | 2020-05-20 23:19:14 -0700 |
---|---|---|
committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-05-20 23:19:14 -0700 |
commit | 905176166a4b33dfbf3c7ac1640381cea53485b6 (patch) | |
tree | e5f4eb058d5d7e5a5d84e2a8fedbd154486db07d /src/fields/ScriptField.ts | |
parent | 07566108db7da0a8e30dcb4c6b884482b57394a1 (diff) | |
parent | 45386f6950e5ae8390486900a430061bfe9e4846 (diff) |
merge with master
Diffstat (limited to 'src/fields/ScriptField.ts')
-rw-r--r-- | src/fields/ScriptField.ts | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fields/ScriptField.ts b/src/fields/ScriptField.ts index 0ac1ac360..503c60790 100644 --- a/src/fields/ScriptField.ts +++ b/src/fields/ScriptField.ts @@ -140,10 +140,8 @@ export class ComputedField extends ScriptField { _valueOutsideReaction = (doc: Doc) => this._lastComputedResult = this.script.run({ this: doc, self: Cast(doc.rootDocument, Doc, null) || doc, _last_: this._lastComputedResult }, console.log).result; - constructor(script: CompiledScript, setterscript?: CompiledScript) { - super(script, - !setterscript && script?.originalScript.includes("self.timecode") ? - ScriptField.CompileScript("self['x' + self.timecode] = value", { value: "any" }, true) : setterscript); + [Copy](): ObjectField { + return new ComputedField(this.script); } public static MakeScript(script: string, params: object = {}) { @@ -163,7 +161,7 @@ export class ComputedField extends ScriptField { } Scripting.addGlobal(function getIndexVal(list: any[], index: number) { - return list.reduce((p, x, i) => (i <= index && x !== undefined) || p === undefined ? x : p, undefined as any) + return list.reduce((p, x, i) => (i <= index && x !== undefined) || p === undefined ? x : p, undefined as any); }); export namespace ComputedField { |