frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

[groups] Better ordering of group elements on the DOM

Browse Source
This commit is contained in:
Nick O'Leary 2020-03-26 22:51:06 +00:00
parent 94ef25bbb9
commit b1d0013214
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -554,8 +554,10 @@ RED.view = (function() {
activeGroups = RED.nodes.groups(activeWorkspace)||[]; activeGroups = RED.nodes.groups(activeWorkspace)||[];
activeGroups.forEach(function(g) { activeGroups.forEach(function(g) {
if (g.g) { if (g.g) {
g._root = g.g;
g._depth = 1; g._depth = 1;
} else { } else {
g._root = g.id;
g._depth = 0; g._depth = 0;
} }
}); });
@ -571,15 +573,30 @@ RED.view = (function() {
g._depth = parentDepth + 1; g._depth = parentDepth + 1;
changed = true; changed = true;
} }
} else { if (g._root !== parentGroup._root) {
console.log("Missing group",g.g); g._root = parentGroup._root;
changed = true;
}
} }
} }
}); });
} while (changed) } while (changed)
activeGroups.sort(function(a,b) { activeGroups.sort(function(a,b) {
return a._depth - b._depth; if (a._root === b._root) {
return a._depth - b._depth;
} else {
return a._root.localeCompare(b._root);
}
}); });
var group = groupLayer.selectAll(".red-ui-flow-group").data(activeGroups,function(d) { return d.id });
group.sort(function(a,b) {
if (a._root === b._root) {
return a._depth - b._depth;
} else {
return a._root.localeCompare(b._root);
}
})
} }
function generateLinkPath(origX,origY, destX, destY, sc) { function generateLinkPath(origX,origY, destX, destY, sc) {
@ -4126,7 +4143,11 @@ if (DEBUG_EVENTS) { console.warn("nodeMouseDown", mouse_mode,d); }
}); });
if (addedGroups) { if (addedGroups) {
group.sort(function(a,b) { group.sort(function(a,b) {
return a._depth - b._depth; if (a._root === b._root) {
return a._depth - b._depth;
} else {
return a._root.localeCompare(b._root);
}
}) })
} }
group[0].reverse(); group[0].reverse();