cleaning

.gitignore

@@ -1 +1,2 @@
 python/.venv
+Data/new.json

index.html

@@ -335,7 +335,6 @@ <h3>Grada</h3>
     <script src="js/MLP/Layer.js"></script>
     <script src="js/MLP/MLP.js"></script>
 
-    <script src="js/pressable.js"></script>
     <script src="js/draggable.js"></script>
 
     <script src="js/Draw/Minors/LoadingIndicator.js"></script>

js/Draw/Layer/BaseLayers/Component.js

@@ -27,6 +27,12 @@ class Component extends FunctionalLayerView {
     this.connected = null;
   }
 
+  // FIXME: determinate if isLoading exists. if is merge the function with mlpview
+  // handlePressed() {
+  //   this.getPressables().forEach((p) => p.handlePressed());
+  //   iManager.checkRollout(this);
+  // }
+
   handleRemove() {
     if (this.connected) {
       this.clearLines();

js/Draw/Layer/BaseLayers/FunctionalLayerView.js

@@ -73,7 +73,6 @@ class FunctionalLayerView extends LayerView {
   }
 
   destroy() {
-    this.removeButton.destroy();
     this.removeButton = null;
 
     this.getDots().forEach((dot) => dot.destroy());

js/Draw/Minors/Buttons/CanvasButton.js

@@ -1,14 +1,15 @@
-class CanvasButton extends Pressable {
+class CanvasButton {
   constructor(onClick) {
-    super();
     this.x = 0;
     this.y = 0;
     this.w = 25;
     this.h = 25;
     this.disabled = false;
     this.hidden = false;
     this.loading = false;
-    this.setOnClick(() => !this.isDisabled() && onClick());
+    this.handlePressed = () => {
+      !this.isDisabled() && iManager.checkRollout(this) && onClick();
+    };
   }
 
   isHidden() {

js/Draw/Minors/Dot.js

@@ -1,6 +1,5 @@
-class Dot extends Pressable {
+class Dot {
   constructor(parent) {
-    super();
     this.parent = parent;
     this.rollover = false;
     this.occupied = false;
@@ -10,7 +9,6 @@ class Dot extends Pressable {
     this.theme = "red";
     this.setColor();
     this.updateCoordinates();
-    this.setOnClick(this.pressed);
   }
 
   isHidden() {
@@ -48,7 +46,6 @@ class Dot extends Pressable {
 
   destroy() {
     this.parent = null;
-    super.destroy();
   }
 
   updateCoordinates() {
@@ -61,8 +58,8 @@ class Dot extends Pressable {
     this.rollover = iManager.isHovered(this);
   }
 
-  pressed() {
-    if (this.isHidden() || !this.rollover) return;
+  handlePressed() {
+    if (this.isHidden() || !iManager.checkRollout(this)) return;
 
     const activeLine = mainOrganizer.getActiveLine();
 

js/Workers/DataProcessor.js

@@ -84,15 +84,4 @@ class DataProcessor {
       processChunk();
     });
   }
-
-  jsonStringify(data) {
-    const jsonWorker = new Worker("../../../js/Workers/jsonStringifyWorker.js");
-    return new Promise((resolve) => {
-      jsonWorker.postMessage(data);
-      jsonWorker.onmessage = function (e) {
-        jsonWorker.terminate();
-        resolve(e.data);
-      };
-    });
-  }
 }

js/draggable.js

@@ -1,12 +1,15 @@
-class Draggable extends Pressable {
+class Draggable {
   constructor(x, y, w, h) {
-    super();
     this.x = x;
     this.y = y;
     this.w = w;
     this.h = h;
   }
 
+  handlePressed() {
+    iManager.checkRollout(this);
+  }
+
   setCoordinates(x, y) {
     this.x = x;
     this.y = y;