From a87a9b58da00ed292f1fde43ed8dc2a1a440cd19 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 4 May 2019 09:03:59 +0200 Subject: [PATCH] Code Cleaning --- FloatingSpace/FloatingObject.js | 13 ++----------- FloatingSpace/Note.js | 8 ++++---- FloatingSpace/ProfileBall.js | 10 ++++------ FloatingSpace/StrategyPart.js | 10 +--------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 5f17169c9..1ca828acd 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -81,22 +81,13 @@ function newFloatingObject () { } case 'Note': { thisObject.underlayingObject = newNote() - thisObject.underlayingObject.initialize(onInitialized) - - function onInitialized (err) { - - } + thisObject.underlayingObject.initialize() break } case 'Strategy Part': { thisObject.underlayingObject = newStrategyPart() - thisObject.underlayingObject.initialize(floatingLayer, pSubType, onInitialized) - - function onInitialized (err) { - - } - + thisObject.underlayingObject.initialize(floatingLayer, pSubType) break } default: { diff --git a/FloatingSpace/Note.js b/FloatingSpace/Note.js index 7fb35b9b9..26e76668d 100644 --- a/FloatingSpace/Note.js +++ b/FloatingSpace/Note.js @@ -14,8 +14,8 @@ function newNote () { return thisObject - function initialize (callBackFunction) { - callBackFunction() + function initialize () { + } function physicsLoop () { @@ -214,7 +214,7 @@ function newNote () { if (label !== undefined) { if (SIZE_PERCENTAGE > 0.9) { - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO let yOffset = (TITLE_BAR_HEIGHT - fontSize) / 2 + 2 @@ -292,7 +292,7 @@ function newNote () { y: startingPosition.y + (i + 1) * (fontSize * FONT_ASPECT_RATIO + 10) } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY browserCanvasContext.fillStyle = 'rgba(60, 60, 60, ' + ALPHA + ')' browserCanvasContext.fillText(labelRow, labelPoint.x, labelPoint.y) } diff --git a/FloatingSpace/ProfileBall.js b/FloatingSpace/ProfileBall.js index 426f0ad1a..2e0c52f8f 100644 --- a/FloatingSpace/ProfileBall.js +++ b/FloatingSpace/ProfileBall.js @@ -53,7 +53,7 @@ function newProfileBall () { return thisObject - function initialize (callBackFunction) { + function initialize () { for (let i = 0; i < ballStringMenu.length; i++) { let menuItem = ballStringMenu[i] @@ -77,8 +77,6 @@ function newProfileBall () { menuItem.icon = menuItem.iconOn // The default value is ON. } - - callBackFunction() } function physicsLoop () { @@ -278,7 +276,7 @@ function newProfileBall () { let labelPoint let fontSize = pFloatingObject.currentFontSize - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY let label @@ -290,7 +288,7 @@ function newProfileBall () { y: pFloatingObject.currentPosition.y - pFloatingObject.currentImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 10 } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY browserCanvasContext.fillStyle = pFloatingObject.labelStrokeStyle browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } @@ -303,7 +301,7 @@ function newProfileBall () { y: pFloatingObject.currentPosition.y + pFloatingObject.currentImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 15 } - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY browserCanvasContext.fillStyle = pFloatingObject.labelStrokeStyle browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y) } diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index b1963cbf1..1579950f1 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -19,7 +19,7 @@ function newStrategyPart () { return thisObject - function initialize (pFloatingLayer, pType, callBackFunction) { + function initialize (pFloatingLayer, pType) { floatingLayer = pFloatingLayer switch (pType) { @@ -97,29 +97,21 @@ function newStrategyPart () { for (let i = 0; i < ballStringMenu.length; i++) { let menuItem = ballStringMenu[i] - menuItem.iconOn = new Image() - menuItem.iconOn.onload = onImageLoad function onImageLoad () { menuItem.iconOff = new Image() - menuItem.iconOff.onload = onImageLoad function onImageLoad () { menuItem.canDrawIcon = true } - menuItem.iconOff.src = window.canvasApp.urlPrefix + menuItem.imagePathOff } - menuItem.iconOn.src = window.canvasApp.urlPrefix + menuItem.imagePathOn - menuItem.icon = menuItem.iconOn // The default value is ON. } - - callBackFunction() } function physicsLoop () {