From 5c91e38dfe4b930e659b317d141299c0eb268b37 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sun, 4 Mar 2018 21:43:14 -0500
Subject: [PATCH] server.exec() refactored into api

---
 src/public/javascripts/api.js    | 28 +++++++++++++++++++++++++++-
 src/public/javascripts/server.js | 26 --------------------------
 src/public/javascripts/utils.js  |  2 --
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/public/javascripts/api.js b/src/public/javascripts/api.js
index 47eee462c..818f18f01 100644
--- a/src/public/javascripts/api.js
+++ b/src/public/javascripts/api.js
@@ -13,11 +13,37 @@ function Api() {
         $pluginButtons.append(button);
     }
 
+    function prepareParams(params) {
+        if (!params) {
+            return params;
+        }
+
+        return params.map(p => {
+            if (typeof p === "function") {
+                return "!@#Function: " + p.toString();
+            }
+            else {
+                return p;
+            }
+        });
+    }
+
+    async function runOnServer(script, params) {
+        if (typeof script === "function") {
+            script = script.toString();
+        }
+
+        const ret = await server.post('script/exec', { script: script, params: prepareParams(params) });
+
+        return ret.executionResult;
+    }
+
     return {
         __modules: {},
         __notes: {},
         addButtonToToolbar,
         activateNote,
-        getInstanceName: noteTree.getInstanceName
+        getInstanceName: noteTree.getInstanceName,
+        runOnServer
     }
 }
\ No newline at end of file
diff --git a/src/public/javascripts/server.js b/src/public/javascripts/server.js
index 4adbb3ee2..96a0306eb 100644
--- a/src/public/javascripts/server.js
+++ b/src/public/javascripts/server.js
@@ -31,31 +31,6 @@ const server = (function() {
         return await call('DELETE', url);
     }
 
-    function prepareParams(params) {
-        if (!params) {
-            return params;
-        }
-
-        return params.map(p => {
-            if (typeof p === "function") {
-                return "!@#Function: " + p.toString();
-            }
-            else {
-                return p;
-            }
-        });
-    }
-
-    async function exec(params, script) {
-        if (typeof script === "function") {
-            script = script.toString();
-        }
-
-        const ret = await post('script/exec', { script: script, params: prepareParams(params) });
-
-        return ret.executionResult;
-    }
-
     let i = 1;
     const reqResolves = {};
 
@@ -119,7 +94,6 @@ const server = (function() {
         post,
         put,
         remove,
-        exec,
         ajax,
         // don't remove, used from CKEditor image upload!
         getHeaders
diff --git a/src/public/javascripts/utils.js b/src/public/javascripts/utils.js
index 1c6d0e80b..63b3a15f7 100644
--- a/src/public/javascripts/utils.js
+++ b/src/public/javascripts/utils.js
@@ -123,8 +123,6 @@ function executeScript(script) {
     ${script}
 })();`;
 
-    console.log(completeScript);
-
     eval(completeScript);
 }