Fixed issue with formated string return value

dvd101x · May 11, 2024 · 3416d5e · 3416d5e
1 parent 4508d2f
commit 3416d5e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/main.js b/main.js
@@ -123,26 +123,37 @@ mathWorker.onmessage = function (oEvent) {
         out.text.forEach(e => {
           const pre = document.createElement("pre");
           if (e.visible) {
-            const div = document.createElement("div");
             const type = e.type;
             const value = e.result;
+            let div
             switch (type) {
+              case "string":
+                div = document.createElement("code");
+                div.innerHTML = value;
+                pre.appendChild(div);
+                break;
               case "any":
+                div = document.createElement("div");
                 div.textContent = value;
+                pre.appendChild(div);
                 break;
               case "error":
+                div = document.createElement("div");
                 div.style.color = "red";
                 div.innerHTML = value;
+                pre.appendChild(div);
                 break;
               case "plot":
+                div = document.createElement("div");
                 try {
                   Plotly.newPlot(div, e.result.data, e.result.layout, e.result.config)
                 } catch (error) {
                   div.innerHTML = 'myError:'+ error.toString();
                 }
+                pre.appendChild(div);
                 break;
             }
-            pre.appendChild(div);
+
             outputs.appendChild(pre);
           }
         });

diff --git a/public/mathWorker.js b/public/mathWorker.js
@@ -240,7 +240,10 @@ function processExpressions(expressions) {
             const { data, layout, config } = result.value
 
             outputs = { type: "plot", result: { data: formatObject(data), layout: formatObject(layout), config: formatObject(config) } }
-        } else {
+        } else if (result.value && typeof result.value == "string") {
+            outputs = { type: "string", result: result.value }
+        }
+        else {
             outputs = { type: "any", result: formatResult(result.value) }
         }
 
@@ -258,7 +261,7 @@ function formatObject(obj) {
     const formatedObject = math.format(obj)
     math.config({ matrix: 'Array' })
     const objResult = math.evaluate(formatedObject)
-    math.config({matrix: matrix})
+    math.config({ matrix: matrix })
     return objResult
 }