fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shortcuts and onfocus ignoring collapsed branches

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-12-11 13:10:04 +01:00
1 parent 9d58659d1c
commit 77525a14b3
4 files changed
+48 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js
+4
View File
@@ -998,6 +998,10 @@ function newNodeDeleter () {
deleteJavascriptCode(node.javascriptCode, rootNodes)
}
if (node.shapes !== undefined) {
deleteUIObject(node.shapes, rootNodes)
}
if (node.panels !== undefined) {
while (node.panels.length > 0) {
deletePlotterPanel(node.panels[0], rootNodes)
DesignerSpace/Workspace/FunctionLibraries/OnFocus.js
+22 -22
View File
@@ -11,8 +11,6 @@ function newOnFocus () {
{
if (node.payload.uiObject.isOnFocus === true) {
return node
} else {
return
}
}
case 'Condition':
@@ -1098,33 +1096,35 @@ function newOnFocus () {
}
/* Then we check all of its own children nodes. */
if (nodeDefinition.properties !== undefined) {
for (let i = 0; i < nodeDefinition.properties.length; i++) {
let property = nodeDefinition.properties[i]
if (node.payload.floatingObject.isCollapsed !== true) {
if (nodeDefinition.properties !== undefined) {
for (let i = 0; i < nodeDefinition.properties.length; i++) {
let property = nodeDefinition.properties[i]
switch (property.type) {
case 'node': {
if (node[property.name] !== undefined) {
let child
child = getNodeThatIsOnFocus(node[property.name])
if (child !== undefined) {
return child
}
}
}
break
case 'array': {
let nodePropertyArray = node[property.name]
if (nodePropertyArray !== undefined) {
for (let m = 0; m < nodePropertyArray.length; m++) {
child = getNodeThatIsOnFocus(nodePropertyArray[m])
switch (property.type) {
case 'node': {
if (node[property.name] !== undefined) {
let child
child = getNodeThatIsOnFocus(node[property.name])
if (child !== undefined) {
return child
}
}
}
break
case 'array': {
let nodePropertyArray = node[property.name]
if (nodePropertyArray !== undefined) {
for (let m = 0; m < nodePropertyArray.length; m++) {
child = getNodeThatIsOnFocus(nodePropertyArray[m])
if (child !== undefined) {
return child
}
}
}
}
break
}
break
}
}
}
DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js
+22 -20
View File
@@ -1076,33 +1076,35 @@ function newShortcutKeys () {
}
/* Check all of its own children nodes. */
if (nodeDefinition.properties !== undefined) {
for (let i = 0; i < nodeDefinition.properties.length; i++) {
let property = nodeDefinition.properties[i]
if (node.payload.floatingObject.isCollapsed !== true) {
if (nodeDefinition.properties !== undefined) {
for (let i = 0; i < nodeDefinition.properties.length; i++) {
let property = nodeDefinition.properties[i]
switch (property.type) {
case 'node': {
if (node[property.name] !== undefined) {
let child
child = getNodeByShortcutKey(node[property.name], searchingKey)
if (child !== undefined) {
return child
}
}
}
break
case 'array': {
let nodePropertyArray = node[property.name]
if (nodePropertyArray !== undefined) {
for (let m = 0; m < nodePropertyArray.length; m++) {
child = getNodeByShortcutKey(nodePropertyArray[m], searchingKey)
switch (property.type) {
case 'node': {
if (node[property.name] !== undefined) {
let child
child = getNodeByShortcutKey(node[property.name], searchingKey)
if (child !== undefined) {
return child
}
}
}
break
case 'array': {
let nodePropertyArray = node[property.name]
if (nodePropertyArray !== undefined) {
for (let m = 0; m < nodePropertyArray.length; m++) {
child = getNodeByShortcutKey(nodePropertyArray[m], searchingKey)
if (child !== undefined) {
return child
}
}
}
}
break
}
break
}
}
}
DesignerSpace/Workspace/Workspace.js
-2
View File
@@ -179,7 +179,6 @@ function newWorkspace () {
function getNodeByShortcutKey (searchingKey) {
for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
let rootNode = thisObject.workspaceNode.rootNodes[i]
let definition = rootNode
let node = functionLibraryShortcutKeys.getNodeByShortcutKey(rootNode, searchingKey)
if (node !== undefined) { return node }
}
@@ -188,7 +187,6 @@ function newWorkspace () {
function getNodeThatIsOnFocus () {
for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
let rootNode = thisObject.workspaceNode.rootNodes[i]
let definition = rootNode
let node = functionLibraryOnFocus.getNodeThatIsOnFocus(rootNode)
if (node !== undefined) { return node }
}