diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
index 7602866f7..7106a89b5 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -24,7 +24,6 @@
-
@@ -56,7 +55,6 @@
command: {value:""},
addpay: {value:false},
addpayValue: {value:"payload"},
- addpayValueType: {value:"msg"},
append: {value:""},
useSpawn: {value:"false"},
timer: {value:""},
@@ -88,7 +86,6 @@
}
$("#node-input-addpayValue").typedInput({
default: "msg",
- typeField: $("#node-input-addpayValueType"),
types: ["msg"]
});
}
diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
index 5b94d9258..47ab02eca 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
@@ -27,7 +27,6 @@ module.exports = function(RED) {
if (n.addpay === undefined) { n.addpay = true; }
this.addpay = n.addpay;
this.addpayValue = n.addpayValue || "payload";
- this.addpayValueType = n.addpayValueType || "msg";
this.append = (n.append || "").trim();
this.useSpawn = (n.useSpawn == "true");
this.timer = Number(n.timer || 0)*1000;
@@ -67,7 +66,7 @@ module.exports = function(RED) {
// then prepend with the msg.payload
var arg = node.cmd;
if (node.addpay) {
- if (node.addpayValueType === "msg" && msg.hasOwnProperty(node.addpayValue)) {
+ if (msg.hasOwnProperty(node.addpayValue)) {
arg += " " + RED.util.getMessageProperty(msg, node.addpayValue);
}
}
diff --git a/test/nodes/core/function/90-exec_spec.js b/test/nodes/core/function/90-exec_spec.js
index c74c716c6..c57225de8 100644
--- a/test/nodes/core/function/90-exec_spec.js
+++ b/test/nodes/core/function/90-exec_spec.js
@@ -115,7 +115,7 @@ describe('exec node', function() {
});
it('should exec a simple command with appended value from message', function (done) {
- var flow = [{id:"n1", type:"exec", wires:[["n2"]], command:"echo", addpay:true, addpayValue:"topic", addpayValueType:"msg", append:"more", oldrc:"false"},
+ var flow = [{id:"n1", type:"exec", wires:[["n2"]], command:"echo", addpay:true, addpayValue:"topic", append:"more", oldrc:"false"},
{id:"n2", type:"helper"}];
helper.load(execNode, flow, function () {
var n1 = helper.getNode("n1");