From a01b7f645d8dd6eea5309b837b82caab4447ca54 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 14 May 2019 12:04:56 +0200 Subject: [PATCH] Menu Item Icons not loadeed locally --- FloatingSpace/CircularMenuItem.js | 17 +--- FloatingSpace/StrategyPartConstructor.js | 112 +++++++++++------------ 2 files changed, 58 insertions(+), 71 deletions(-) diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js index 53803a756..af26ef4d2 100644 --- a/FloatingSpace/CircularMenuItem.js +++ b/FloatingSpace/CircularMenuItem.js @@ -74,21 +74,8 @@ function newCircularMenuItem () { thisObject.payload = pPayload /* Load Menu Images */ - thisObject.iconOn = new Image() - thisObject.iconOn.onload = onOnImageLoad - - function onOnImageLoad () { - if (thisObject.imagePathOff !== undefined) { - thisObject.iconOff = new Image() - thisObject.iconOff.onload = onOffImageLoad - - function onOffImageLoad () { - thisObject.canDrawIcon = true - } - thisObject.iconOff.src = window.canvasApp.urlPrefix + thisObject.imagePathOff - } - } - thisObject.iconOn.src = window.canvasApp.urlPrefix + thisObject.imagePathOn + thisObject.iconOn = canvas.strategySpace.iconCollection.get(thisObject.imagePathOn) + thisObject.iconOff = canvas.strategySpace.iconCollection.get(thisObject.imagePathOff) if (thisObject.currentStatus === true) { thisObject.icon = thisObject.iconOn diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index eb8fc1ce7..438b19085 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -64,8 +64,8 @@ function newStrategyPartConstructor () { currentStatus: true, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -76,8 +76,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Reload', visible: false, - imagePathOn: 'Images/Icons/style-01/vector.png', - imagePathOff: 'Images/Icons/style-01/vector.png', + imagePathOn: 'vector', + imagePathOff: 'vector', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -91,8 +91,8 @@ function newStrategyPartConstructor () { workDoneLabel: 'Saved', workFailedLabel: 'Not Saved', visible: false, - imagePathOn: 'Images/Icons/style-01/upload.png', - imagePathOff: 'Images/Icons/style-01/upload.png', + imagePathOn: 'upload', + imagePathOff: 'upload', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -103,8 +103,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'New Strategy', visible: false, - imagePathOn: 'Images/Icons/style-01/quality.png', - imagePathOff: 'Images/Icons/style-01/quality.png', + imagePathOn: 'quality', + imagePathOff: 'quality', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -115,8 +115,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Settings', visible: false, - imagePathOn: 'Images/Icons/style-01/tools.png', - imagePathOff: 'Images/Icons/style-01/tools.png', + imagePathOn: 'tools', + imagePathOff: 'tools', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -132,8 +132,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -144,8 +144,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Delete This Strategy', visible: false, - imagePathOn: 'Images/Icons/style-01/trash.png', - imagePathOff: 'Images/Icons/style-01/trash.png', + imagePathOn: 'trash', + imagePathOff: 'trash', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -156,8 +156,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Settings', visible: false, - imagePathOn: 'Images/Icons/style-01/tools.png', - imagePathOff: 'Images/Icons/style-01/tools.png', + imagePathOn: 'tools', + imagePathOff: 'tools', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -173,8 +173,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -185,8 +185,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Situation', visible: false, - imagePathOn: 'Images/Icons/style-01/attractive.png', - imagePathOff: 'Images/Icons/style-01/attractive.png', + imagePathOn: 'attractive', + imagePathOff: 'attractive', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -202,8 +202,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -214,8 +214,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Situation', visible: false, - imagePathOn: 'Images/Icons/style-01/attractive.png', - imagePathOff: 'Images/Icons/style-01/attractive.png', + imagePathOn: 'attractive', + imagePathOff: 'attractive', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -231,8 +231,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -243,8 +243,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Situation', visible: false, - imagePathOn: 'Images/Icons/style-01/attractive.png', - imagePathOff: 'Images/Icons/style-01/attractive.png', + imagePathOn: 'attractive', + imagePathOff: 'attractive', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -260,8 +260,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -272,8 +272,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Phase', visible: false, - imagePathOn: 'Images/Icons/style-01/placeholder.png', - imagePathOff: 'Images/Icons/style-01/placeholder.png', + imagePathOn: 'placeholder', + imagePathOff: 'placeholder', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -289,8 +289,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -301,8 +301,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Phase', visible: false, - imagePathOn: 'Images/Icons/style-01/placeholder.png', - imagePathOff: 'Images/Icons/style-01/placeholder.png', + imagePathOn: 'placeholder', + imagePathOff: 'placeholder', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -323,8 +323,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -335,8 +335,8 @@ function newStrategyPartConstructor () { actionFunction: strategyPart.codeEditor.activate, label: 'Edit Code', visible: false, - imagePathOn: 'Images/Icons/style-01/html.png', - imagePathOff: 'Images/Icons/style-01/html.png', + imagePathOn: 'html', + imagePathOff: 'html', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -347,8 +347,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Situation', visible: false, - imagePathOn: 'Images/Icons/style-01/attractive.png', - imagePathOff: 'Images/Icons/style-01/attractive.png', + imagePathOn: 'attractive', + imagePathOff: 'attractive', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -359,8 +359,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Delete This Phase', visible: false, - imagePathOn: 'Images/Icons/style-01/trash.png', - imagePathOff: 'Images/Icons/style-01/trash.png', + imagePathOn: 'trash', + imagePathOff: 'trash', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -376,8 +376,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -388,8 +388,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Condition', visible: false, - imagePathOn: 'Images/Icons/style-01/testing.png', - imagePathOff: 'Images/Icons/style-01/testing.png', + imagePathOn: 'testing', + imagePathOff: 'testing', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -400,8 +400,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Delete This Situation', visible: false, - imagePathOn: 'Images/Icons/style-01/trash.png', - imagePathOff: 'Images/Icons/style-01/trash.png', + imagePathOn: 'trash', + imagePathOff: 'trash', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -422,8 +422,8 @@ function newStrategyPartConstructor () { currentStatus: false, label: undefined, visible: false, - imagePathOn: 'Images/Icons/style-01/target.png', - imagePathOff: 'Images/Icons/style-01/security.png', + imagePathOn: 'target', + imagePathOff: 'security', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -434,8 +434,8 @@ function newStrategyPartConstructor () { actionFunction: strategyPart.codeEditor.activate, label: 'Edit Code', visible: false, - imagePathOn: 'Images/Icons/style-01/html.png', - imagePathOff: 'Images/Icons/style-01/html.png', + imagePathOn: 'html', + imagePathOff: 'html', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -446,8 +446,8 @@ function newStrategyPartConstructor () { actionFunction: payload.onMenuItemClick, label: 'Delete This Condition', visible: false, - imagePathOn: 'Images/Icons/style-01/trash.png', - imagePathOff: 'Images/Icons/style-01/trash.png', + imagePathOn: 'trash', + imagePathOff: 'trash', rawRadius: 8, targetRadius: 0, currentRadius: 0,