customop errorhandling with new op class

cables-gl · Jan 17, 2025 · ec20a85 · ec20a85
1 parent 0eb439c
commit ec20a85
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/...ated/Ops.Extension.Deprecated.Cables.CustomOp/Ops.Extension.Deprecated.Cables.CustomOp.js b/...ated/Ops.Extension.Deprecated.Cables.CustomOp/Ops.Extension.Deprecated.Cables.CustomOp.js
@@ -197,9 +197,9 @@ const execute = () =>
                 const name = "Ops.Custom.CUSTOM" + op.id.replace(/-/g, "");
                 const code = inJS.get();
                 let codeHead = "Ops.Custom = Ops.Custom || {};\n";
-                codeHead += name + " = " + name + " || {};\n";
-                codeHead += name + " = function()\n{\nCABLES.Op.apply(this,arguments);\nconst op=this;\n";
-                let codeFoot = "\n\n};\n\n" + name + ".prototype = new CABLES.Op();\n";
+                codeHead += name + " = class extends CABLES.Op \n{";
+                codeHead += "constructor()\n{ super(...arguments);\nconst op=this;const attachments=op.attachments={};\n";
+                let codeFoot = "}\n\n};\n\n";
                 codeFoot += "new " + name + "();\n";
                 const opCode = codeHead + code + codeFoot;
                 op.setUiError("error", e);

diff --git a/...ed/Ops.Extension.Deprecated.Cables.CustomOp/Ops.Extension.Deprecated.Cables.CustomOp.json b/...ed/Ops.Extension.Deprecated.Cables.CustomOp/Ops.Extension.Deprecated.Cables.CustomOp.json
@@ -22,6 +22,12 @@
             "type": "deprecation",
             "author": "stephan",
             "date": 1719915871534
+        },
+        {
+            "message": "refactor to use new op class",
+            "type": "improvement",
+            "author": "stephan",
+            "date": 1737112559414
         }
     ],
     "authorName": "stephan",

diff --git a/...ps.Extension.Deprecated.Cables.CustomOp_v2/Ops.Extension.Deprecated.Cables.CustomOp_v2.js b/...ps.Extension.Deprecated.Cables.CustomOp_v2/Ops.Extension.Deprecated.Cables.CustomOp_v2.js
@@ -85,7 +85,7 @@ op.onError = function (ex)
                 if (badLines[bj] == j) isBadLine = true;
 
             if (isBadLine) htmlWarning += "<span class=\"error\">";
-            htmlWarning += line.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+            htmlWarning += line.replaceAll("&", "&amp;").replaceAll("<", "<").replaceAll(">", ">").replaceAll("\"", "&quot;")
                 .replaceAll("'", "&#039;");
             if (isBadLine) htmlWarning += "</span>";
         }
@@ -310,11 +310,12 @@ const execute = () =>
                 const name = "Ops.Custom.CUSTOM" + op.id.replace(/-/g, "");
                 const code = inJS.get();
                 let codeHead = "Ops.Custom = Ops.Custom || {};\n";
-                codeHead += name + " = " + name + " || {};\n";
-                codeHead += name + " = function()\n{\nCABLES.Op.apply(this,arguments);\nconst op=this;\n";
-                let codeFoot = "\n\n};\n\n" + name + ".prototype = new CABLES.Op();\n";
+                codeHead += name + " = class extends CABLES.Op \n{";
+                codeHead += "constructor()\n{ super(...arguments);\nconst op=this;const attachments=op.attachments={};\n";
+                let codeFoot = "}\n\n};\n\n";
                 codeFoot += "new " + name + "();\n";
                 const opCode = codeHead + code + codeFoot;
+
                 const errorEl = document.createElement("script");
                 errorEl.id = "customop-error-" + op.id;
                 errorEl.type = "text/javascript";

diff --git a/....Extension.Deprecated.Cables.CustomOp_v2/Ops.Extension.Deprecated.Cables.CustomOp_v2.json b/....Extension.Deprecated.Cables.CustomOp_v2/Ops.Extension.Deprecated.Cables.CustomOp_v2.json
@@ -52,6 +52,12 @@
             "type": "deprecation",
             "author": "stephan",
             "date": 1719915896310
+        },
+        {
+            "message": "refactor to use new op class",
+            "type": "improvement",
+            "author": "stephan",
+            "date": 1737112571269
         }
     ],
     "authorName": "stephan",