From 9903795cff2060526d68d7cc357493e3e3749476 Mon Sep 17 00:00:00 2001 From: anika-ahluwalia Date: Wed, 10 Jun 2020 15:21:07 -0500 Subject: UI cleanup --- src/client/util/ScriptManager.ts | 3 ++- src/client/util/Scripting.ts | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/client/util') diff --git a/src/client/util/ScriptManager.ts b/src/client/util/ScriptManager.ts index 2b82786b3..e8bbe180a 100644 --- a/src/client/util/ScriptManager.ts +++ b/src/client/util/ScriptManager.ts @@ -1,7 +1,7 @@ import { Doc, DocListCast } from "../../fields/Doc"; import { List } from "../../fields/List"; import { Docs } from "../documents/Documents"; -import { Scripting, ScriptParam } from "./Scripting"; +import { Scripting } from "./Scripting"; import { StrCast, Cast } from "../../fields/Types"; import { listSpec } from "../../fields/Schema"; import { ScriptingBox } from "../views/nodes/ScriptingBox"; @@ -14,6 +14,7 @@ export class ScriptManager { return this._instance || (this._instance = new this()); } private constructor() { + console.log("CONSTRUCTED"); ScriptingBox.DeleteScript = this.deleteScript; ScriptingBox.AddScript = this.addScript; } diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts index 5847623cc..f618a9e6e 100644 --- a/src/client/util/Scripting.ts +++ b/src/client/util/Scripting.ts @@ -10,6 +10,8 @@ export { ts }; // @ts-ignore import * as typescriptlib from '!!raw-loader!./type_decls.d'; import { Doc, Field } from '../../fields/Doc'; +import { Cast } from "../../fields/Types"; +import { listSpec } from "../../fields/Schema"; export interface ScriptSucccess { success: true; @@ -69,6 +71,7 @@ export namespace Scripting { if (third !== undefined) { obj.push(third); } + n = first.name; } } else if (first && typeof first.name === "string") { n = first.name; @@ -162,6 +165,7 @@ function Run(script: string | undefined, customParams: string[], diagnostics: an } return { success: true, result }; } catch (error) { + if (batch) { batch.end(); } -- cgit v1.2.3-70-g09d2