change PR to only use a single property for the 2nd output

node-red · Feb 15, 2020 · 127b361 · 127b361
1 parent 88e7296
commit 127b361
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
@@ -88,7 +88,6 @@
             op2type: {value:"val"},
             duration: {value:"250",required:true,validate:RED.validators.number()},
             extend: {value:"false"},
-            second: {value:false},
             units: {value:"ms"},
             reset: {value:""},
             bytopic: {value:"all"},
@@ -123,6 +122,9 @@
                     $("#node-stream-topic").show();
                 }
             });
+
+            if (this.outputs == 2) { $("#node-input-second").prop('checked', true) }
+            else { $("#node-input-second").prop('checked', false) }
 
             $("#node-input-second").change(function() {
                 if ($("#node-input-second").is(":checked")) {

diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
@@ -24,7 +24,7 @@ module.exports = function(RED) {
         this.op2 = n.op2 || "0";
         this.op1type = n.op1type || "str";
         this.op2type = n.op2type || "str";
-        this.second = n.second || false;
+        this.second = (n.outputs == 2) ? true : false;
         this.topic = n.topic || "topic";
 
         if (this.op1type === 'val') {

diff --git a/test/nodes/core/function/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
@@ -827,7 +827,7 @@ describe('trigger node', function() {
     });
 
     it('should be able to send 2nd message to a 2nd output', function(done) {
-        var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"val", op1:"hello",  op2:"world", duration:"50", second:true, wires:[["n2"],["n3"]] },
+        var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"val", op1:"hello",  op2:"world", duration:"50", outputs:2, wires:[["n2"],["n3"]] },
             {id:"n2", type:"helper"}, {id:"n3", type:"helper"} ];
         helper.load(triggerNode, flow, function() {
             var n1 = helper.getNode("n1");