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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary
2020-12-07 11:48:38 +00:00
parent bbe3ee701f 9f3e9786a8
commit beccdac717
10 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/node_modules/@node-red/nodes/core/function/89-trigger.js vendored
View File

@@ -179,7 +179,10 @@ module.exports = function(RED) {
/* istanbul ignore else */
if (node.op1type !== "nul") {
var msg2 = RED.util.cloneMessage(msg);
node.topics[topic].tout = setInterval(function() { node.send(RED.util.cloneMessage(msg2)); }, delayDuration);
node.topics[topic].tout = setInterval(function() {
if (node.op1type === "date") { msg2.payload = Date.now(); }
node.send(RED.util.cloneMessage(msg2));
}, delayDuration);
}
}
else {
@@ -209,6 +212,7 @@ module.exports = function(RED) {
}
else {
msg2.payload = node.topics[topic].m2;
if (node.op2type === "date") { msg2.payload = Date.now(); }
if (node.second === true) { node.send([null,msg2]); }
else { node.send(msg2); }
}

2
packages/node_modules/@node-red/nodes/package.json vendored
View File

@@ -31,7 +31,7 @@
"is-utf8": "0.2.1",
"js-yaml": "3.14.0",
"media-typer": "1.1.0",
"mqtt": "4.2.5",
"mqtt": "4.2.6",
"multer": "1.4.2",
"mustache": "4.0.1",
"on-headers": "1.0.2",