From ec766d22711b8054a47071d037c292dfc5aaea4c Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 29 Jun 2019 20:04:33 +0200 Subject: [PATCH] Confirmation Labels --- FloatingSpace/CircularMenu.js | 1 + FloatingSpace/CircularMenuItem.js | 3 ++- FloatingSpace/StrategyPartConstructor.js | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/FloatingSpace/CircularMenu.js b/FloatingSpace/CircularMenu.js index 0eeba34f7..d35759070 100644 --- a/FloatingSpace/CircularMenu.js +++ b/FloatingSpace/CircularMenu.js @@ -68,6 +68,7 @@ function newCircularMenu () { menuItem.relatedStrategyPart = menuItemInitialValue.relatedStrategyPart menuItem.dontShowAtFullscreen = menuItemInitialValue.dontShowAtFullscreen menuItem.askConfirmation = menuItemInitialValue.askConfirmation + menuItem.confirmationLabel = menuItemInitialValue.confirmationLabel if (menuItem.label === undefined) { menuItem.type = 'Icon Only' diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js index 1ed429791..d969cdb74 100644 --- a/FloatingSpace/CircularMenuItem.js +++ b/FloatingSpace/CircularMenuItem.js @@ -6,6 +6,7 @@ function newCircularMenuItem () { type: undefined, isDeployed: undefined, askConfirmation: undefined, + confirmationLabel: undefined, iconOn: undefined, iconOff: undefined, currentIcon: undefined, @@ -194,7 +195,7 @@ function newCircularMenuItem () { } if (temporaryStatus === 0 && thisObject.askConfirmation === true) { - setTemporaryStatus('Confirm to Delete', UI_COLOR.GREY, 50) + setTemporaryStatus(thisObject.confirmationLabel, UI_COLOR.GREY, 50) } } diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 94d0b458f..e63b2a851 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -187,6 +187,7 @@ function newStrategyPartConstructor () { { action: 'Delete Trading System', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete Trading System', visible: false, @@ -270,6 +271,7 @@ function newStrategyPartConstructor () { { action: 'Delete Parameters', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete Parameters', visible: false, @@ -339,6 +341,7 @@ function newStrategyPartConstructor () { { action: 'Delete Base Asset', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete Base Asset', visible: false, @@ -421,6 +424,7 @@ function newStrategyPartConstructor () { { action: 'Delete Strategy', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Strategy', visible: false, @@ -503,6 +507,7 @@ function newStrategyPartConstructor () { { action: 'Delete Trigger Stage', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Stage', visible: false, @@ -572,6 +577,7 @@ function newStrategyPartConstructor () { { action: 'Delete Open Stage', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Stage', visible: false, @@ -641,6 +647,7 @@ function newStrategyPartConstructor () { { action: 'Delete Manage Stage', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Stage', visible: false, @@ -698,6 +705,7 @@ function newStrategyPartConstructor () { { action: 'Delete Close Stage', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Stage', visible: false, @@ -755,6 +763,7 @@ function newStrategyPartConstructor () { { action: 'Delete Position Size', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete Trading System', visible: false, @@ -838,6 +847,7 @@ function newStrategyPartConstructor () { { action: 'Delete Event', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Event', visible: false, @@ -908,6 +918,7 @@ function newStrategyPartConstructor () { { action: 'Delete Event', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Event', visible: false, @@ -978,6 +989,7 @@ function newStrategyPartConstructor () { { action: 'Delete Event', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Event', visible: false, @@ -1047,6 +1059,7 @@ function newStrategyPartConstructor () { { action: 'Delete Initial Definition', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Definition', visible: false, @@ -1117,6 +1130,7 @@ function newStrategyPartConstructor () { { action: 'Delete Managed Item', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Item', visible: false, @@ -1187,6 +1201,7 @@ function newStrategyPartConstructor () { { action: 'Delete Managed Item', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Item', visible: false, @@ -1270,6 +1285,7 @@ function newStrategyPartConstructor () { { action: 'Delete Phase', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Phase', visible: false, @@ -1345,6 +1361,7 @@ function newStrategyPartConstructor () { { action: 'Delete Formula', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Formula', visible: false, @@ -1415,6 +1432,7 @@ function newStrategyPartConstructor () { { action: 'Delete Event', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Event', visible: false, @@ -1485,6 +1503,7 @@ function newStrategyPartConstructor () { { action: 'Delete Situation', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Situation', visible: false, @@ -1555,6 +1574,7 @@ function newStrategyPartConstructor () { { action: 'Delete Condition', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Condition', visible: false, @@ -1630,6 +1650,7 @@ function newStrategyPartConstructor () { { action: 'Delete Code', askConfirmation: true, + confirmationLabel: 'Confirm to Delete', actionFunction: payload.onMenuItemClick, label: 'Delete This Code', visible: false,