diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js index 413ea80ec..95f18f03f 100644 --- a/FloatingSpace/FloatingLayer.js +++ b/FloatingSpace/FloatingLayer.js @@ -227,8 +227,8 @@ function newFloatingLayer () { payload.profile = { position: { - x: pFloatingObject.payload.profile.position.x, - y: pFloatingObject.payload.profile.position.y + x: pFloatingObject.payload.position.x, + y: pFloatingObject.payload.position.y }, visible: pFloatingObject.payload.profile.visible, botAvatar: pFloatingObject.payload.profile.botAvatar @@ -350,8 +350,8 @@ function newFloatingLayer () { break } case 'Strategy Part': { - payload.position = floatingObject.payload.profile.position - payload.visible = floatingObject.payload.profile.visible + payload.position = floatingObject.payload.position + payload.visible = floatingObject.payload.visible break } default: { @@ -402,7 +402,7 @@ function newFloatingLayer () { break } case 'Strategy Part': { - payload.visible = floatingObject.payload.profile.visible + payload.visible = floatingObject.payload.visible break } default: { @@ -502,8 +502,8 @@ function newFloatingLayer () { break } case 'Strategy Part': { - payload.position = floatingObject.payload.profile.position - payload.visible = floatingObject.payload.profile.visible + payload.position = floatingObject.payload.position + payload.visible = floatingObject.payload.visible break } default: { @@ -736,7 +736,7 @@ function newFloatingLayer () { break } case 'Strategy Part': { - payload.position = floatingObject2.payload.profile.position + payload.position = floatingObject2.payload.position break } default: { diff --git a/FloatingSpace/ProfileBall.js b/FloatingSpace/ProfileBall.js index 32a2c9b73..2e8c5c526 100644 --- a/FloatingSpace/ProfileBall.js +++ b/FloatingSpace/ProfileBall.js @@ -183,8 +183,8 @@ function newProfileBall () { function drawBackground (pFloatingObject) { let point = { - x: pFloatingObject.payload.profile.position.x, - y: pFloatingObject.payload.profile.position.y + x: pFloatingObject.payload.position.x, + y: pFloatingObject.payload.position.y } point = viewPort.fitIntoVisibleArea(point) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index f271c77b4..cda32802d 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -305,14 +305,14 @@ function newStrategyPart () { /* Here we do the trick of recalculation the position of the anchor by setting it to the position of its parent */ let parentFloatingObject = floatingLayer.getFloatingObject(pFloatingObject.payload.parentNode.handle) - pFloatingObject.payload.profile.position.x = parentFloatingObject.container.frame.position.x - pFloatingObject.payload.profile.position.y = parentFloatingObject.container.frame.position.y + pFloatingObject.payload.position.x = parentFloatingObject.container.frame.position.x + pFloatingObject.payload.position.y = parentFloatingObject.container.frame.position.y /* Here I continue painting the background */ let point = { - x: pFloatingObject.payload.profile.position.x, - y: pFloatingObject.payload.profile.position.y + x: pFloatingObject.payload.position.x, + y: pFloatingObject.payload.position.y } if (pFloatingObject.container.frame.radius > 1) { @@ -399,7 +399,7 @@ function newStrategyPart () { let label - label = pFloatingObject.payload.profile.upLabel + label = pFloatingObject.payload.upLabel if (label !== undefined) { labelPoint = { @@ -412,7 +412,7 @@ function newStrategyPart () { browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } - label = pFloatingObject.payload.profile.downLabel + label = pFloatingObject.payload.downLabel if (label !== undefined && thisObject.isOnFocus === true) { labelPoint = { diff --git a/StrategySpace/StrategyCollectionItem.js b/StrategySpace/StrategyCollectionItem.js index 957d8652f..928a3b384 100644 --- a/StrategySpace/StrategyCollectionItem.js +++ b/StrategySpace/StrategyCollectionItem.js @@ -87,29 +87,24 @@ function newStrategyCollectionItem () { default: } - - payload.profile.upLabel = payload.profile.upLabel + '1' } function createPart (partType, name, node, parentNode, title) { let payload = { - profile: { - position: { - x: (viewPort.width - SIDE_PANEL_WIDTH) / 2 + SIDE_PANEL_WIDTH, - y: viewPort.height / 2 - }, - visible: true + position: { + x: (viewPort.width - SIDE_PANEL_WIDTH) / 2 + SIDE_PANEL_WIDTH, + y: viewPort.height / 2 }, - notes: [] + visible: true } if (title !== undefined) { - payload.profile.upLabel = title + payload.upLabel = title } else { - payload.profile.upLabel = partType + payload.upLabel = partType } - payload.profile.downLabel = name + payload.downLabel = name payload.node = node payload.parentNode = parentNode payload.onMenuItemClick = onMenuItemClick