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

Do not trim wires if node declares outputs in defaults but misses value

Browse Source 
Fixes #1737
This commit is contained in:
Nick O'Leary 2018-05-24 20:25:26 +01:00
parent 10395ef254
commit 0ef16989cd
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/js/nodes.js
View File

@ -1033,15 +1033,31 @@ RED.nodes = (function() {
node.type = "unknown"; node.type = "unknown";
} }
if (node._def.category != "config") { if (node._def.category != "config") {
node.inputs = n.inputs||node._def.inputs; if (n.hasOwnProperty('inputs')) {
node.outputs = n.outputs||node._def.outputs; node.inputs = n.inputs;
// If 'wires' is longer than outputs, clip wires node._config.inputs = JSON.stringify(n.inputs);
} else {
node.inputs = node._def.inputs;
}
if (n.hasOwnProperty('outputs')) {
node.outputs = n.outputs;
node._config.outputs = JSON.stringify(n.outputs);
} else {
node.outputs = node._def.outputs;
}
if (node.hasOwnProperty('wires') && node.wires.length > node.outputs) { if (node.hasOwnProperty('wires') && node.wires.length > node.outputs) {
if (!node._def.defaults.hasOwnProperty("outputs") || !isNaN(parseInt(n.outputs))) {
// If 'wires' is longer than outputs, clip wires
console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs); console.log("Warning: node.wires longer than node.outputs - trimming wires:",node.id," wires:",node.wires.length," outputs:",node.outputs);
node.wires = node.wires.slice(0,node.outputs); node.wires = node.wires.slice(0,node.outputs);
} else {
// The node declares outputs in its defaults, but has not got a valid value
// Defer to the length of the wires array
node.outputs = node.wires.length;
}
} }
for (d in node._def.defaults) { for (d in node._def.defaults) {
if (node._def.defaults.hasOwnProperty(d)) { if (node._def.defaults.hasOwnProperty(d) && d !== 'inputs' && d !== 'outputs') {
node[d] = n[d]; node[d] = n[d];
node._config[d] = JSON.stringify(n[d]); node._config[d] = JSON.stringify(n[d]);
} }