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 pull request #724 from vielmetti/travis-node-4

Browse Source 
Support for Node 4.0.0 and Travis CI testing for same
This commit is contained in:
Nick O'Leary
2015-09-25 23:02:49 +01:00
parent 3963fa9738 005a98d020
commit caa83ac830
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/core/89-trigger.js
View File

@@ -64,7 +64,7 @@ module.exports = function(RED) {
else if (node.op1Templated) { msg.payload = mustache.render(node.op1,msg); }
else { msg.payload = node.op1; }
if (node.op1type !== "nul") { node.send(msg); }
if (node.duration === 0) { tout = "infinite"; }
if (node.duration === 0) { tout = 0; }
else {
tout = setTimeout(function() {
msg.payload = m2;