diff --git a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js index 768153f6a..37a3b8baf 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js @@ -501,7 +501,7 @@ function newChainAttachDetach () { completeDetachment(node, rootNodes) return } - case 'Code': { + case 'Javascript Code': { node.payload.parentNode.code = undefined completeDetachment(node, rootNodes) return @@ -1100,7 +1100,7 @@ function newChainAttachDetach () { completeAttachment(node, rootNodes) } break - case 'Code': { + case 'Javascript Code': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode node.payload.parentNode.code = node diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js index f96277c64..e1e95e554 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js @@ -227,7 +227,7 @@ function newNodeChildren () { case 'Condition': { return countChildrenCondition(parentNode, childNode) } - case 'Code': { + case 'Javascript Code': { return countChildrenCode(parentNode, childNode) } default: { diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js index 1435c1a90..c2a987ba3 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -372,7 +372,7 @@ function newNodeDeleter () { deleteCondition(rootNode, rootNodes) break } - case 'Code': { + case 'Javascript Code': { deleteCode(rootNode, rootNodes) break } diff --git a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js index d3633c3d7..353eb3723 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js +++ b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js @@ -7,7 +7,7 @@ function newOnFocus () { function getNodeThatIsOnFocus (node) { if (node === undefined) { return } switch (node.type) { - case 'Code': + case 'Javascript Code': { if (node.payload.uiObject.isOnFocus === true) { return node diff --git a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js index 3ed3c191b..328100cc0 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -7,7 +7,7 @@ function newProtocolNode () { function getProtocolNode (node, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) { if (node === undefined) { return } switch (node.type) { - case 'Code': + case 'Javascript Code': { let object = { type: node.type, diff --git a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js index 874f93f29..31e3c7070 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js @@ -7,7 +7,7 @@ function newShortcutKeys () { function getNodeByShortcutKey (node, searchingKey) { if (node === undefined) { return } switch (node.type) { - case 'Code': + case 'Javascript Code': { if (node.payload.uiObject.shortcutKey === searchingKey) { return node diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 3552d6552..356cdfa59 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -110,9 +110,9 @@ function newUiObjectsFromNodes () { function createUiObjectFromNode (node, parentNode, chainParent, positionOffset) { switch (node.type) { - case 'Code': + case 'Javascript Code': { - createUiObject(false, 'Code', node.name, node, parentNode, chainParent, 'Code', positionOffset) + createUiObject(false, 'Javascript Code', node.name, node, parentNode, chainParent, 'Javascript Code', positionOffset) return } case 'Condition': @@ -2033,7 +2033,7 @@ function newUiObjectsFromNodes () { node.code = { code: DEFAULT_CODE_TEXT } - createUiObject(true, 'Code', '', node.code, node, node) + createUiObject(true, 'Javascript Code', '', node.code, node, node) } return node.code @@ -2099,7 +2099,7 @@ function newUiObjectsFromNodes () { } situation.conditions.push(condition) createUiObject(true, 'Condition', condition.name, condition, situation, situation, 'Condition') - createUiObject(true, 'Code', '', condition.code, condition, condition, 'Code') + createUiObject(true, 'Javascript Code', '', condition.code, condition, condition, 'Javascript Code') return condition } diff --git a/FloatingSpace/CodeEditor.js b/FloatingSpace/CodeEditor.js index 4c40de669..2770294ce 100644 --- a/FloatingSpace/CodeEditor.js +++ b/FloatingSpace/CodeEditor.js @@ -71,7 +71,7 @@ function newCodeEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Code' && thisObject.payload.node.type !== 'Formula') { + if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { try { let code = JSON.parse(thisObject.payload.node.code) } catch (err) { @@ -220,4 +220,3 @@ function newCodeEditor () { } } } - diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js index b9463357e..859c58b6f 100644 --- a/FloatingSpace/ConditionEditor.js +++ b/FloatingSpace/ConditionEditor.js @@ -71,7 +71,7 @@ function newConditionEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Code' && thisObject.payload.node.type !== 'Formula') { + if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { try { let code = JSON.parse(thisObject.payload.node.code) } catch (err) { @@ -220,4 +220,3 @@ function newConditionEditor () { } } } - diff --git a/FloatingSpace/ConfigEditor.js b/FloatingSpace/ConfigEditor.js index 0d5ce7bba..34ba77931 100644 --- a/FloatingSpace/ConfigEditor.js +++ b/FloatingSpace/ConfigEditor.js @@ -71,7 +71,7 @@ function newConfigEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Code' && thisObject.payload.node.type !== 'Formula') { + if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { try { let code = JSON.parse(thisObject.payload.node.code) } catch (err) { @@ -220,4 +220,3 @@ function newConfigEditor () { } } } - diff --git a/FloatingSpace/FormulaEditor.js b/FloatingSpace/FormulaEditor.js index 6eeb20f92..18bbdbde8 100644 --- a/FloatingSpace/FormulaEditor.js +++ b/FloatingSpace/FormulaEditor.js @@ -71,7 +71,7 @@ function newFormulaEditor () { let textArea = document.getElementById('textArea') textArea.style.display = 'none' thisObject.payload.node.code = textArea.value - if (thisObject.payload.node.type !== 'Code' && thisObject.payload.node.type !== 'Formula') { + if (thisObject.payload.node.type !== 'Javascript Code' && thisObject.payload.node.type !== 'Formula') { try { let code = JSON.parse(thisObject.payload.node.code) } catch (err) { @@ -220,4 +220,3 @@ function newFormulaEditor () { } } } - diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 677af7a48..402248e41 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -550,7 +550,7 @@ function newUiObject () { compatibleType = '->' + 'Situation' + '->' compatibleSubType = undefined break - case 'Code': + case 'Javascript Code': compatibleType = '->' + 'Condition' + '->' + 'Procedure Initialization' + '->' + 'Procedure Loop' + '->' + 'Plotter Module' + '->' + 'Plotter Panel' + '->' compatibleSubType = undefined break @@ -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 === 'Code' && nearbyNode.code !== undefined) { continue } + if (thisObject.payload.node.type === 'Javascript Code' && nearbyNode.code !== 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/FloatingSpace/UiObjectConstructor.js b/FloatingSpace/UiObjectConstructor.js index 8b86dfbc8..99dec544b 100644 --- a/FloatingSpace/UiObjectConstructor.js +++ b/FloatingSpace/UiObjectConstructor.js @@ -1067,7 +1067,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Code', visible: true, - relatedUiObject: 'Code', + relatedUiObject: 'Javascript Code', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -1116,7 +1116,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Code', visible: true, - relatedUiObject: 'Code', + relatedUiObject: 'Javascript Code', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -1633,7 +1633,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Code', visible: true, - relatedUiObject: 'Code', + relatedUiObject: 'Javascript Code', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -1695,7 +1695,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Code', visible: true, - relatedUiObject: 'Code', + relatedUiObject: 'Javascript Code', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -4601,7 +4601,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Code', visible: true, - relatedUiObject: 'Code', + relatedUiObject: 'Javascript Code', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -4640,7 +4640,7 @@ function newUiObjectConstructor () { ) break } - case 'Code': { + case 'Javascript Code': { uiObject.codeEditor = newCodeEditor() uiObject.codeEditor.isVisibleFunction = uiObject.isVisibleFunction uiObject.codeEditor.initialize() @@ -5003,7 +5003,7 @@ function newUiObjectConstructor () { level_5() break } - case 'Code': { + case 'Javascript Code': { level_5() break } diff --git a/Spaces/DesignerSpace.js b/Spaces/DesignerSpace.js index ba1413c04..4d2c4764c 100644 --- a/Spaces/DesignerSpace.js +++ b/Spaces/DesignerSpace.js @@ -86,7 +86,7 @@ function newDesignerSpace () { ['Next Phase Event', 'pantone'], ['Situation', 'pyramid'], ['Condition', 'testing'], - ['Code', 'html'], + ['Javascript Code', 'html'], ['Team', 'team'], ['Sensor Bot', 'bot-sensor'], ['Indicator Bot', 'bot-indicator'],