From 1855b1eb7fb8c7d60b4812203eaa2ad8e8e0e0ce Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 10 May 2020 09:01:29 +0200 Subject: [PATCH] conditions editor improvement --- DesignSpace/Workspace/Workspace.js | 10 ++++++++++ FloatingSpace/ConditionEditor.js | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js index 3b1a4891e..cb72e1245 100644 --- a/DesignSpace/Workspace/Workspace.js +++ b/DesignSpace/Workspace/Workspace.js @@ -508,6 +508,16 @@ function newWorkspace () { referenceDetachNode(payload.node) } break + case 'Push Code to Javascript Code': + { + payload.node.javascriptCode.code = payload.node.code + } + break + case 'Fetch Code to Javascript Code': + { + payload.node.code = payload.node.javascriptCode.code + } + break case 'Open Documentation': { let definition = APP_SCHEMA_MAP.get(payload.node.type) diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js index cb6c2662f..5b22ff07e 100644 --- a/FloatingSpace/ConditionEditor.js +++ b/FloatingSpace/ConditionEditor.js @@ -105,9 +105,6 @@ function newConditionEditor () { } function loadFromCode () { - if (thisObject.payload.node.javascriptCode !== undefined) { - thisObject.payload.node.code = thisObject.payload.node.javascriptCode.code - } if (thisObject.payload.node.code === undefined) { thisObject.payload.node.code = '' } conditionStructure.code = thisObject.payload.node.code.replace(/ /g, '') @@ -621,10 +618,6 @@ function newConditionEditor () { thisObject.payload.node.code = code - if (thisObject.payload.node.javascriptCode !== undefined) { - thisObject.payload.node.javascriptCode.code = thisObject.payload.node.code - } - function logicOperandToCode (logicOperand) { algebraOperandToCode(logicOperand.comparison.operandA.algebra.operandA) if (logicOperand.comparison.operandA.algebra.picker.getSelected() !== '...') {