Merge branch 'master' into secondpropertiesmenu-emily

1 files changed, 16 insertions, 22 deletions

diff --git a/src/client/util/ScriptManager.ts b/src/client/util/ScriptManager.ts
index 42a6493ea..87509f2ea 100644
--- a/src/client/util/ScriptManager.ts
+++ b/src/client/util/ScriptManager.ts
@@ -1,12 +1,11 @@
-import { Doc, DocListCast } from "../../fields/Doc";
-import { List } from "../../fields/List";
-import { listSpec } from "../../fields/Schema";
-import { Cast, StrCast } from "../../fields/Types";
-import { Docs } from "../documents/Documents";
-import { ScriptingGlobals } from "./ScriptingGlobals";
+import { Doc, DocListCast } from '../../fields/Doc';
+import { List } from '../../fields/List';
+import { listSpec } from '../../fields/Schema';
+import { Cast, StrCast } from '../../fields/Types';
+import { Docs } from '../documents/Documents';
+import { ScriptingGlobals } from './ScriptingGlobals';
 
 export class ScriptManager {
-
     static _initialized = false;
     private static _instance: ScriptManager;
     public static get Instance(): ScriptManager {
@@ -24,11 +23,7 @@ export class ScriptManager {
     }
     public getAllScripts(): Doc[] {
         const sdoc = ScriptManager.Instance.ScriptManagerDoc;
-        if (sdoc) {
-            const docs = DocListCast(sdoc.data);
-            return docs;
-        }
-        return [];
+        return sdoc ? DocListCast(sdoc.data) : [];
     }
 
     public addScript(scriptDoc: Doc): boolean {
@@ -59,36 +54,35 @@ export class ScriptManager {
     }
 
     public static addScriptToGlobals(scriptDoc: Doc): void {
-
         ScriptingGlobals.removeGlobal(StrCast(scriptDoc.name));
 
-        const params = Cast(scriptDoc["data-params"], listSpec("string"), []);
+        const params = Cast(scriptDoc['data-params'], listSpec('string'), []);
         const paramNames = params.reduce((o: string, p: string) => {
             if (params.indexOf(p) === params.length - 1) {
-                o = o + p.split(":")[0].trim();
+                o = o + p.split(':')[0].trim();
             } else {
-                o = o + p.split(":")[0].trim() + ",";
+                o = o + p.split(':')[0].trim() + ',';
             }
             return o;
-        }, "" as string);
+        }, '' as string);
 
         const f = new Function(paramNames, StrCast(scriptDoc.script));
 
         Object.defineProperty(f, 'name', { value: StrCast(scriptDoc.name), writable: false });
 
-        let parameters = "(";
+        let parameters = '(';
         params.forEach((element: string, i: number) => {
             if (i === params.length - 1) {
-                parameters = parameters + element + ")";
+                parameters = parameters + element + ')';
             } else {
-                parameters = parameters + element + ", ";
+                parameters = parameters + element + ', ';
             }
         });
 
-        if (parameters === "(") {
+        if (parameters === '(') {
             ScriptingGlobals.add(f, StrCast(scriptDoc.description));
         } else {
             ScriptingGlobals.add(f, StrCast(scriptDoc.description), parameters);
         }
     }
-}
\ No newline at end of file
+}