From a23e17244aa05ee3ae387e0b446cdf6664390631 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 29 Aug 2020 20:25:41 +0200 Subject: [PATCH] cleaning --- FloatingSpace/FloatingLayer.js | 6 ------ FloatingSpace/FloatingObject.js | 3 +++ FloatingSpace/UiObject.js | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js index bb59a9a7c..95aec16f9 100644 --- a/FloatingSpace/FloatingLayer.js +++ b/FloatingSpace/FloatingLayer.js @@ -74,12 +74,6 @@ function newFloatingLayer() { if (container !== undefined) { return container } } - for (let i = 0; i < invisibleFloatingObjects.length; i++) { - let floatingObject = invisibleFloatingObjects[i] - container = floatingObject.getContainer(point) - if (container !== undefined) { return container } - } - return container } diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 79bb44217..a89979978 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -111,9 +111,12 @@ function newFloatingObject() { } function getContainer(point) { + + if (thisObject.payload === undefined) { return } if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return } if (canvas.floatingSpace.inMapMode === true) { return } + let container container = thisObject.payload.uiObject.getContainer(point) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 502ffb08d..3b7ab2109 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -242,6 +242,7 @@ function newUiObject() { } function getContainer(point) { + let container if (isDragging === false && thisObject.isOnFocus === true) {