From 9aa6d09979b4b53f44e002c80cfa1b2d9c04fc9e Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sun, 6 May 2018 10:28:29 +0200
Subject: [PATCH] Cleaning Code

---
 .vs/AAWeb/v15/.suo             | Bin 70656 -> 70656 bytes
 Canvas.js                      |   2 +-
 FloatingSpace/FloatingLayer.js |  34 ++++++++++++++++++++++++---------
 server.js                      |   2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo
index a5c09c7fd678b6d7973d6c27658b83b3c76206ba..bcb873b4748d8d57f4c6ad8414e893a9d7dba61d 100644
GIT binary patch
delta 400
zcmZoz!P2mTWkU`Vo4^dQhr&-c7cu=}X8Vw0x*Wu2V-sNdE3~;v?4Ku?PH5BQ{wu`5
zAk4tPz{$`*dE&(Q$pzOqC(B&Zm^|U)vdOx=6DKP^o4eV!dm`haKBmcuPt_;qZ||5q
zVUqpicM}#dBJ0rHtT*Wr<K%=kE+*&1MN?QN@1LMQ*?Pu$)+vlY(>K4LA;>!U!z`Xf
z^LQrDTP-=c;RwfM-Br$l6M&KspmbmwkRi9ZaaBFzWZefmla+4BZI&x}#JHJf-Cw57
ze_t^(F4`nSyn9b@5bxf}j%6~_1%wz`HY;3tzzB8vX2wjQvt=0<-Qbw~@u~V|n+LWm
cxZTUYnSb41#zilfCiizqOxAt%6y#z}0L+@Ah5!Hn

delta 467
zcmZoz!P2mTWkU`V+k~yVOBOxZT*UN?nN5LLMiRtkV-sK!65d=T_Ro`v6G$htX>xN4
zGcW)V11H1m$rC5WPtI9q%eVx};+q_|onvysT!YQ|Jrfxx$M=c>1uQ2!c28uS3smB`
zsE=v##0jyJqoUO&8+2t)em7weBixkDijyugE}FtJIdF#X<ew8YCmUSb#2O8>$pvJ<
z=8Bm$EQ{vxOpaYA3$=w~@|M-kVz!JxB~Y*t$PNdxU6vv_$a1p6>MN5s%E)b&D|y7o
z%>+}-z_9uM+J8)&IX8Y6;ueDY3ezu_y7ic__~ir#hF>uCDo#4ZIN7mGX1ah7Bg<xm
zUk@247flkH{9&RIs`n;W%q(7XgJZJ8Y=h0x4?J1KN|C&^1IRYS@YZI9r>B_~y<lQ0
UDV|)nPJ6P%hNqi_Ucb`-0QLZ{%K!iX

diff --git a/Canvas.js b/Canvas.js
index bcd5e32cb..b237269af 100644
--- a/Canvas.js
+++ b/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;
diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js
index 561968de3..23d46ed66 100644
--- a/FloatingSpace/FloatingLayer.js
+++ b/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;
+                }
             }
         }
     }
diff --git a/server.js b/server.js
index f4b180fca..626140bfd 100644
--- a/server.js
+++ b/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) {