Merge remote-tracking branch 'origin/speedups2' into temporalmedia-mehek

1 files changed, 6 insertions, 6 deletions

diff --git a/src/client/util/ScriptManager.ts b/src/client/util/ScriptManager.ts
index 94806a7ba..42a6493ea 100644
--- a/src/client/util/ScriptManager.ts
+++ b/src/client/util/ScriptManager.ts
@@ -1,9 +1,9 @@
 import { Doc, DocListCast } from "../../fields/Doc";
 import { List } from "../../fields/List";
-import { Scripting } from "./Scripting";
-import { StrCast, Cast } from "../../fields/Types";
 import { listSpec } from "../../fields/Schema";
+import { Cast, StrCast } from "../../fields/Types";
 import { Docs } from "../documents/Documents";
+import { ScriptingGlobals } from "./ScriptingGlobals";
 
 export class ScriptManager {
 
@@ -44,7 +44,7 @@ export class ScriptManager {
 
     public deleteScript(scriptDoc: Doc): boolean {
         if (scriptDoc.name) {
-            Scripting.removeGlobal(StrCast(scriptDoc.name));
+            ScriptingGlobals.removeGlobal(StrCast(scriptDoc.name));
         }
         const scriptList = this.getAllScripts();
         const index = scriptList.indexOf(scriptDoc);
@@ -60,7 +60,7 @@ export class ScriptManager {
 
     public static addScriptToGlobals(scriptDoc: Doc): void {
 
-        Scripting.removeGlobal(StrCast(scriptDoc.name));
+        ScriptingGlobals.removeGlobal(StrCast(scriptDoc.name));
 
         const params = Cast(scriptDoc["data-params"], listSpec("string"), []);
         const paramNames = params.reduce((o: string, p: string) => {
@@ -86,9 +86,9 @@ export class ScriptManager {
         });
 
         if (parameters === "(") {
-            Scripting.addGlobal(f, StrCast(scriptDoc.description));
+            ScriptingGlobals.add(f, StrCast(scriptDoc.description));
         } else {
-            Scripting.addGlobal(f, StrCast(scriptDoc.description), parameters);
+            ScriptingGlobals.add(f, StrCast(scriptDoc.description), parameters);
         }
     }
 }
\ No newline at end of file