Cleaning Code

Canvas.js

@@ -393,7 +393,7 @@ function newCanvas() {
 
             if (floatingObjectDragStarted) {
 
-                let floatingObject = thisObject.floatingSpace.floatingLayer.floatingObjects[floatingObjectBeingDragged];
+                let floatingObject = thisObject.floatingSpace.floatingLayer.getFloatingObject(undefined, floatingObjectBeingDragged);
 
                 floatingObject.currentPosition.x = dragVector.upX;
                 floatingObject.currentPosition.y = dragVector.upY;

FloatingSpace/FloatingLayer.js

@@ -148,27 +148,43 @@ function newFloatingLayer() {
         }
     }
 
-    function getFloatingObject(pFloatingObjectHandle) {
+    function getFloatingObject(pFloatingObjectHandle, pFloatingObjectIndex) {
 
         if (INFO_LOG === true) { logger.write("[INFO] getFloatingObject -> Entering function."); }
 
-        for (let i = 0; i < invisibleFloatingObjects.length; i++) {
+        if (pFloatingObjectHandle !== undefined) {
 
-            let floatingObject = invisibleFloatingObjects[i];
+            for (let i = 0; i < invisibleFloatingObjects.length; i++) {
 
-            if (floatingObject.handle === pFloatingObjectHandle) {
+                let floatingObject = invisibleFloatingObjects[i];
 
-                return floatingObject;
+                if (floatingObject.handle === pFloatingObjectHandle) {
+
+                    return floatingObject;
+                }
+            }
+
+            for (let i = 0; i < thisObject.floatingObjects.length; i++) {
+
+                let floatingObject = thisObject.floatingObjects[i];
+
+                if (floatingObject.handle === pFloatingObjectHandle) {
+
+                    return floatingObject;
+                }
             }
         }
 
-        for (let i = 0; i < thisObject.floatingObjects.length; i++) {
+        if (pFloatingObjectIndex !== undefined) {
 
-            let floatingObject = thisObject.floatingObjects[i];
+            for (let i = 0; i < thisObject.floatingObjects.length; i++) {
 
-            if (floatingObject.handle === pFloatingObjectHandle) {
+                let floatingObject = thisObject.floatingObjects[i];
 
-                return floatingObject;
+                if (i === pFloatingObjectIndex) {
+
+                    return floatingObject;
+                }
             }
         }
     }

server.js

@@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) {
 
 }
 
-const DEBUG_MODE = false;           // This forces the server to read Plotters from the local drive.
+const DEBUG_MODE = true;           // This forces the server to read Plotters from the local drive.
 
 if (CONSOLE_LOG === true && DEBUG_MODE === true) {