issue #887 corrrect loading behaviour, fix not supported IE functions

OpenRoberta · Oct 15, 2020 · 1f872f2 · 1f872f2
1 parent 7e93a22
commit 1f872f2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/OpenRobertaServer/staticResources/js/app/configVisualization/confVisualization.js b/OpenRobertaServer/staticResources/js/app/configVisualization/confVisualization.js
@@ -33,6 +33,14 @@ define(["require", "exports", "./wires", "./const.robots", "./robotBlock", "./po
     exports.CircuitVisualization = void 0;
     var SEP = 2.5;
     var STROKE = 1.8;
+    // fix for IE which does not have the remove function
+    if (!('remove' in Element.prototype)) {
+        Element.prototype.remove = function () {
+            if (this.parentNode) {
+                this.parentNode.removeChild(this);
+            }
+        };
+    }
     var CircuitVisualization = /** @class */ (function () {
         function CircuitVisualization(workspace, dom) {
             var _this = this;

diff --git a/OpenRobertaServer/staticResources/js/main.js b/OpenRobertaServer/staticResources/js/main.js
@@ -116,7 +116,15 @@ require.config({
         'blockly': {
             exports: 'Blockly'
         },
-
+        'confVisualization': {
+            deps: ['blockly']
+        },
+        'robotBlock': {
+            deps: ['blockly']
+        },
+        'port': {
+            deps: ['blockly']
+        },
         'volume-meter': {
             exports: "Volume",
             init: function() {

diff --git a/TypeScriptSources/ts/app/configVisualization/confVisualization.ts b/TypeScriptSources/ts/app/configVisualization/confVisualization.ts
@@ -6,6 +6,15 @@ import { Port } from "./port";
 const SEP = 2.5;
 const STROKE = 1.8;
 
+// fix for IE which does not have the remove function
+if (!('remove' in Element.prototype)) {
+    (Element.prototype as any).remove = function() {
+        if (this.parentNode) {
+            this.parentNode.removeChild(this);
+        }
+    };
+}
+
 export class CircuitVisualization {
     components: {};
     connections: any;
@@ -91,7 +100,8 @@ export class CircuitVisualization {
 
     injectRobotBoard(): void {
         if (this.robotXml) {
-            (this.robotXml as any).remove();
+                (this.robotXml as any).remove();
+
         }
         (<any>window).Blockly.Blocks['robot'] = createRobotBlock(this.currentRobot);
         const robotXml = `<instance x="250" y="250"><block type="robot" id="robot"></block></instance>`;