diff --git a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js index 37a3b8baf..e4c5e9e04 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js @@ -502,7 +502,7 @@ function newChainAttachDetach () { return } case 'Javascript Code': { - node.payload.parentNode.code = undefined + node.payload.parentNode.javascriptCode = undefined completeDetachment(node, rootNodes) return } @@ -1103,7 +1103,7 @@ function newChainAttachDetach () { case 'Javascript Code': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode - node.payload.parentNode.code = node + node.payload.parentNode.javascriptCode = node completeAttachment(node, rootNodes) } break diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js index e1e95e554..1eb525cd0 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js @@ -228,7 +228,7 @@ function newNodeChildren () { return countChildrenCondition(parentNode, childNode) } case 'Javascript Code': { - return countChildrenCode(parentNode, childNode) + return countChildrenJavascriptCode(parentNode, childNode) } default: { console.log('WARNING this parentNode type is not listed at NodeChildren: ' + parentNode.type) @@ -1483,7 +1483,7 @@ function newNodeChildren () { return response } - function countChildrenCode (parentNode, childNode) { + function countChildrenJavascriptCode (parentNode, childNode) { let response = { childrenCount: 0, childIndex: undefined diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js index c2a987ba3..da06b462f 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -69,7 +69,7 @@ function newNodeDeleter () { deleteFormula: deleteFormula, deleteSituation: deleteSituation, deleteCondition: deleteCondition, - deleteCode: deleteCode + deleteJavascriptCode: deleteJavascriptCode } return thisObject @@ -373,7 +373,7 @@ function newNodeDeleter () { break } case 'Javascript Code': { - deleteCode(rootNode, rootNodes) + deleteJavascriptCode(rootNode, rootNodes) break } @@ -733,8 +733,8 @@ function newNodeDeleter () { payload.parentNode.loop = undefined } - if (node.code !== undefined) { - deleteCode(node.code, rootNodes) + if (node.javascriptCode !== undefined) { + deleteJavascriptCode(node.javascriptCode, rootNodes) } completeDeletion(node, rootNodes) @@ -919,8 +919,8 @@ function newNodeDeleter () { } } - if (node.code !== undefined) { - deleteCode(node.code, rootNodes) + if (node.javascriptCode !== undefined) { + deleteJavascriptCode(node.javascriptCode, rootNodes) } if (node.panels !== undefined) { @@ -946,8 +946,8 @@ function newNodeDeleter () { } } - if (node.code !== undefined) { - deleteCode(node.code, rootNodes) + if (node.javascriptCode !== undefined) { + deleteJavascriptCode(node.javascriptCode, rootNodes) } completeDeletion(node, rootNodes) @@ -1697,17 +1697,17 @@ function newNodeDeleter () { } else { completeDeletion(node, rootNodes) } - if (node.code !== undefined) { - deleteCode(node.code, rootNodes) + if (node.javascriptCode !== undefined) { + deleteJavascriptCode(node.javascriptCode, rootNodes) } destroyUiObject(node) cleanNode(node) } - function deleteCode (node, rootNodes) { + function deleteJavascriptCode (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { - payload.parentNode.code = undefined + payload.parentNode.javascriptCode = undefined } else { completeDeletion(node, rootNodes) } diff --git a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js index 328100cc0..72d5389f0 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -29,7 +29,7 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: getProtocolNode(node.code, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) + javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) } if (includeIds) { object.id = node.id @@ -1402,7 +1402,7 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: getProtocolNode(node.code, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) + javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) } if (includeIds) { object.id = node.id @@ -1417,7 +1417,7 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: getProtocolNode(node.code, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) + javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) } if (includeIds) { object.id = node.id @@ -1617,7 +1617,7 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: getProtocolNode(node.code, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType), + javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType), panels: [] } if (includeParent) { @@ -1646,7 +1646,7 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: getProtocolNode(node.code, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) + javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) } if (includeIds) { object.id = node.id diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 356cdfa59..9617118a6 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -65,7 +65,7 @@ function newUiObjectsFromNodes () { addNextPhaseEvent: addNextPhaseEvent, addSituation: addSituation, addCondition: addCondition, - addCode: addCode + addJavascriptCode: addJavascriptCode } let mapOfReferenceParents @@ -118,8 +118,9 @@ function newUiObjectsFromNodes () { case 'Condition': { createUiObject(false, 'Condition', node.name, node, parentNode, chainParent, 'Condition', positionOffset) - if (node.code !== undefined) { - createUiObjectFromNode(node.code, node, node, positionOffset) + + if (node.javascriptCode !== undefined) { + createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) } return } @@ -898,15 +899,17 @@ function newUiObjectsFromNodes () { } case 'Procedure Initialization': { createUiObject(false, node.type, node.name, node, parentNode, chainParent, node.type, positionOffset) - if (node.code !== undefined) { - createUiObjectFromNode(node.code, node, node, positionOffset) + + if (node.javascriptCode !== undefined) { + createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) } return } case 'Procedure Loop': { createUiObject(false, node.type, node.name, node, parentNode, chainParent, node.type, positionOffset) - if (node.code !== undefined) { - createUiObjectFromNode(node.code, node, node, positionOffset) + + if (node.javascriptCode !== undefined) { + createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) } return } @@ -1047,8 +1050,9 @@ function newUiObjectsFromNodes () { } } createUiObject(false, node.type, node.name, node, parentNode, chainParent, node.type, positionOffset) - if (node.code !== undefined) { - createUiObjectFromNode(node.code, node, node, positionOffset) + + if (node.javascriptCode !== undefined) { + createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) } for (let m = 0; m < node.panels.length; m++) { let panel = node.panels[m] @@ -1065,8 +1069,9 @@ function newUiObjectsFromNodes () { } case 'Plotter Panel': { createUiObject(false, node.type, node.name, node, parentNode, chainParent, node.type, positionOffset) - if (node.code !== undefined) { - createUiObjectFromNode(node.code, node, node, positionOffset) + + if (node.javascriptCode !== undefined) { + createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) } return } @@ -2028,15 +2033,15 @@ function newUiObjectsFromNodes () { return node.nextPhaseEvent } - function addCode (node) { - if (node.code === undefined) { - node.code = { + function addJavascriptCode (node) { + if (node.javascriptCode === undefined) { + node.javascriptCode = { code: DEFAULT_CODE_TEXT } createUiObject(true, 'Javascript Code', '', node.code, node, node) } - return node.code + return node.javascriptCode } function addPhase (parentNode) { diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js index 428952428..f00e90f40 100644 --- a/DesignerSpace/Workspace/Workspace.js +++ b/DesignerSpace/Workspace/Workspace.js @@ -637,7 +637,7 @@ function newWorkspace () { break case 'Add Code': { - functionLibraryUiObjectsFromNodes.addCode(payload.node) + functionLibraryUiObjectsFromNodes.addJavascriptCode(payload.node) } break case 'Add Exchange Account': @@ -922,7 +922,7 @@ function newWorkspace () { break } case 'Delete Code': { - functionLibraryNodeDeleter.deleteCode(payload.node, thisObject.workspaceNode.rootNodes) + functionLibraryNodeDeleter.deleteJavascriptCode(payload.node, thisObject.workspaceNode.rootNodes) break } case 'Delete Exchange Account': { diff --git a/FloatingSpace/CodeEditor.js b/FloatingSpace/CodeEditor.js index 2770294ce..cffba932a 100644 --- a/FloatingSpace/CodeEditor.js +++ b/FloatingSpace/CodeEditor.js @@ -71,13 +71,6 @@ function newCodeEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { - try { - let code = JSON.parse(thisObject.payload.node.code) - } catch (err) { - thisObject.payload.uiObject.setErrorMessage(err.message, 10) - } - } } } diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js index 859c58b6f..373c5def7 100644 --- a/FloatingSpace/ConditionEditor.js +++ b/FloatingSpace/ConditionEditor.js @@ -71,13 +71,6 @@ function newConditionEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { - try { - let code = JSON.parse(thisObject.payload.node.code) - } catch (err) { - thisObject.payload.uiObject.setErrorMessage(err.message, 10) - } - } } } diff --git a/FloatingSpace/ConfigEditor.js b/FloatingSpace/ConfigEditor.js index 34ba77931..17fbd8818 100644 --- a/FloatingSpace/ConfigEditor.js +++ b/FloatingSpace/ConfigEditor.js @@ -71,12 +71,11 @@ function newConfigEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { - try { - let code = JSON.parse(thisObject.payload.node.code) - } catch (err) { - thisObject.payload.uiObject.setErrorMessage(err.message, 10) - } + + try { + let code = JSON.parse(thisObject.payload.node.code) + } catch (err) { + thisObject.payload.uiObject.setErrorMessage(err.message, 10) } } } diff --git a/FloatingSpace/FormulaEditor.js b/FloatingSpace/FormulaEditor.js index 18bbdbde8..f2e805485 100644 --- a/FloatingSpace/FormulaEditor.js +++ b/FloatingSpace/FormulaEditor.js @@ -71,13 +71,6 @@ function newFormulaEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { - try { - let code = JSON.parse(thisObject.payload.node.code) - } catch (err) { - thisObject.payload.uiObject.setErrorMessage(err.message, 10) - } - } } } diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 402248e41..50eb1d391 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -609,7 +609,7 @@ function newUiObject () { if (thisObject.payload.node.type === 'Take Profit' && nearbyNode.takeProfit !== undefined) { continue } if (thisObject.payload.node.type === 'Formula' && nearbyNode.formula !== undefined) { continue } if (thisObject.payload.node.type === 'Next Phase Event' && nearbyNode.nextPhaseEvent !== undefined) { continue } - if (thisObject.payload.node.type === 'Javascript Code' && nearbyNode.code !== undefined) { continue } + if (thisObject.payload.node.type === 'Javascript Code' && nearbyNode.javascriptCode !== undefined) { continue } /* Here we check if the subtypes are compatible. */ if (nearbyNode.subType !== undefined && compatibleSubType !== undefined) { if (compatibleSubType.indexOf('->' + nearbyNode.subType + '->') < 0) { diff --git a/Panels/PlotterPanel.js b/Panels/PlotterPanel.js index abe7f0dee..493c41a05 100644 --- a/Panels/PlotterPanel.js +++ b/Panels/PlotterPanel.js @@ -88,7 +88,7 @@ function newPlotterPanel () { if (currentRecord.data === undefined) { return } try { - eval(panelNode.code.code) + eval(panelNode.javascriptCode.code) } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] finalize -> err = ' + err.stack) } } diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index c38f46096..a7f3f5213 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -159,8 +159,8 @@ function newProductsPanel () { continue } - if (plotterModuleNode.code === undefined) { continue } - if (plotterModuleNode.code.code === undefined) { continue } + if (plotterModuleNode.javascriptCode === undefined) { continue } + if (plotterModuleNode.javascriptCode.code === undefined) { continue } /* Conversion to fit old format */ product.plotter = plotter diff --git a/Plotter.js b/Plotter.js index 28dd82efd..de33a8f26 100644 --- a/Plotter.js +++ b/Plotter.js @@ -270,12 +270,12 @@ function newPlotter () { /* This is Initialization Code */ if (calculationsProcedure.initialization !== undefined) { - if (calculationsProcedure.initialization.code !== undefined) { + if (calculationsProcedure.initialization.javascriptCode !== undefined) { try { - eval(calculationsProcedure.initialization.code.code) + eval(calculationsProcedure.initialization.javascriptCode.code) } catch (err) { logger.write('[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Error = ' + err.stack) - logger.write('[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Code = ' + calculationsProcedure.initialization.code.code) + logger.write('[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Code = ' + calculationsProcedure.initialization.javascriptCode.code) throw ('Error Executing User Code.') } } @@ -283,17 +283,17 @@ function newPlotter () { /* This is Initialization Code */ if (calculationsProcedure.loop !== undefined) { - if (calculationsProcedure.loop.code !== undefined) { + if (calculationsProcedure.loop.javascriptCode !== undefined) { for (let index = 0; index < jsonArray.length; index++) { let product = jsonArray[index] /* This is Loop Code */ try { - eval(calculationsProcedure.loop.code.code) + eval(calculationsProcedure.loop.javascriptCode.code) } catch (err) { logger.write('[ERROR] calculationsProcedure -> loop -> Error executing User Code. Error = ' + err.stack) logger.write('[ERROR] calculationsProcedure -> loop -> Error executing User Code. product = ' + JSON.stringify(product)) - logger.write('[ERROR] calculationsProcedure -> loop -> Error executing User Code. Code = ' + calculationsProcedure.loop.code.code) + logger.write('[ERROR] calculationsProcedure -> loop -> Error executing User Code. Code = ' + calculationsProcedure.loop.javascriptCode.code) throw ('Error Executing User Code.') } @@ -480,7 +480,7 @@ function newPlotter () { thisObject.container.eventHandler.raiseEvent('Current Record Changed', currentRecord) } - eval(productDefinition.referenceParent.code.code) + eval(productDefinition.referenceParent.javascriptCode.code) } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] plotChart -> err = ' + err) }