frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove direct access to RED.nodes.nodes/links

Browse Source 
- Adds RED.nodes.filterNodes and RED.nodes.filterLinks for
   doing simply queries to find elements that match a criteria
This commit is contained in:
Nick O'Leary
2015-03-15 23:31:38 +00:00
parent 71db193675
commit cf8fe16b09
3 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/red/ui/view.js
View File

@@ -232,13 +232,14 @@ RED.view = (function() {
var drag_line = vis.append("svg:path").attr("class", "drag_line");
function updateActiveNodes() {
//TODO: remove direct access to RED.nodes.nodes
activeNodes = RED.nodes.nodes.filter(function(d) {
return d.z == RED.workspaces.active();
var activeWorkspace = RED.workspaces.active();
activeNodes = RED.nodes.filterNodes({z:activeWorkspace});
activeLinks = RED.nodes.filterLinks({
source:{z:activeWorkspace},
target:{z:activeWorkspace}
});
activeLinks = RED.nodes.links.filter(function(d) {
return d.source.z == RED.workspaces.active() && d.target.z == RED.workspaces.active();
})
}
function init() {
@@ -1185,7 +1186,6 @@ RED.view = (function() {
vis.selectAll(".subflowinput").remove();
}
//var node = vis.selectAll(".nodegroup").data(RED.nodes.nodes.filter(function(d) { return d.z == RED.workspaces.active() }),function(d){return d.id});
var node = vis.selectAll(".nodegroup").data(activeNodes,function(d){return d.id});
node.exit().remove();

5
public/red/ui/workspaces.js
View File

@@ -44,10 +44,7 @@ RED.workspaces = (function() {
}
var nodes = [];
if (!force) {
//TODO: remove direct access to RED.nodes.nodes
nodes = RED.nodes.nodes.filter(function(d) {
return d.z == ws.id;
});
nodes = RED.nodes.filterNodes({z:ws.id});
}
if (force || nodes.length === 0) {
removeWorkspace(ws);