Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-01-27 23:28:19 +00:00
44 changed files with 285 additions and 226 deletions

View File

@@ -737,7 +737,10 @@ module.exports = function(RED) {
group.msg = Object.assign(group.msg, msg);
group.send = send;
var tcnt = group.targetCount;
if (msg.hasOwnProperty("parts")) { tcnt = group.targetCount || msg.parts.count; }
if (msg.hasOwnProperty("parts")) {
tcnt = group.targetCount || msg.parts.count;
group.targetCount = tcnt;
}
if ((tcnt > 0 && group.currentCount >= tcnt) || msg.hasOwnProperty('complete')) {
completeSend(partId);
}
@@ -759,3 +762,4 @@ module.exports = function(RED) {
}
RED.nodes.registerType("join",JoinNode);
}