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

let join also accumulate strings (and not fail)

Browse Source
This commit is contained in:
Dave Conway-Jones
2017-06-15 00:11:35 +01:00
parent 2b2136c468
commit 56405ac903
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nodes/core/logic/17-split.html
View File

@@ -239,6 +239,9 @@
var val = $(this).val();
$(".node-row-custom").toggle(val==='custom');
$(".form-tips-auto").toggle(val==='auto');
if (val === "auto") {
$("#node-input-accumulate").attr('checked', false);
}
});
$("#node-input-build").change(function(e) {

7
nodes/core/logic/17-split.js
View File

@@ -354,9 +354,12 @@ module.exports = function(RED) {
currentCount:0,
payload:{},
targetCount:targetCount,
type:"object",
type:payloadType,
msg:msg
}
if (payloadType === 'string') {
inflight[partId].payload = [];
}
}
else {
inflight[partId] = {
@@ -364,7 +367,6 @@ module.exports = function(RED) {
payload:[],
targetCount:targetCount,
type:payloadType,
joinChar: joinChar,
msg:msg
};
if (payloadType === 'string') {
@@ -374,7 +376,6 @@ module.exports = function(RED) {
} else if (payloadType === 'buffer') {
inflight[partId].bufferLen = 0;
}
}
if (node.timer > 0) {
inflight[partId].timeout = setTimeout(function() {