From c475ed065b2a71b183ac6a6d85cb8a8524997bf3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 19 Dec 2019 14:38:24 +0100 Subject: [PATCH] Key can be added from parameters --- .../Workspace/FunctionLibraries/UiObjectsFromNodes.js | 7 ++++++- DesignerSpace/Workspace/Workspace.js | 7 +++++++ FloatingSpace/FloatingObject.js | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 8a3d93a5a..425cd8674 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -1623,7 +1623,12 @@ function newUiObjectsFromNodes () { name: 'New Key', code: 'Paste your exchange API secret key here and the put the key name as this key object title. Secret keys are filtered out and NOT exported when using the SHARE menu option on any object at your workspace. Secret keys ARE downloaded when using the download button.' } - exchangeAccount.keys.push(key) + if (exchangeAccount.keys !== undefined) { + exchangeAccount.keys.push(key) + } else { + exchangeAccount.key = key + } + createUiObject(true, 'Exchange Account Key', key.name, key, exchangeAccount, exchangeAccount, 'Account Key') return key diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js index 90659c367..e3963f14a 100644 --- a/DesignerSpace/Workspace/Workspace.js +++ b/DesignerSpace/Workspace/Workspace.js @@ -203,12 +203,19 @@ function newWorkspace () { if (droppedNode.type === 'Workspace') { stopAllRunningTasks() + console.log(new Date()) functionLibraryNodeDeleter.deleteWorkspace(thisObject.workspaceNode, thisObject.workspaceNode.rootNodes) + console.log(new Date()) canvas.floatingSpace.warmUp() + console.log(new Date()) thisObject.workspaceNode = droppedNode + console.log(new Date()) functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode) + console.log(new Date()) canvas.chartSpace.finalize() + console.log(new Date()) canvas.chartSpace.initialize() + console.log(new Date()) return } diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 53f88ca5d..4c2eec098 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -318,7 +318,12 @@ function newFloatingObject () { } function someoneAquiredFocus (container) { - if (container === undefined) { return } + if (container === undefined) { + return + } + if (thisObject.container === undefined) { + return + } if (container.id !== thisObject.container.id) { removeFocus() }