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
2022-01-12 17:59:26 +00:00
parent cb96fb735e 6d2793cac6
commit f86e743cce
38 changed files with 545 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/node_modules/@node-red/nodes/core/common/20-inject.html vendored
View File

@@ -690,9 +690,9 @@
this.topic = "";
var result = getProps(items, true);
this.props = result.props;
if(result.payloadType) { this.payloadType = result.payloadType; };
if(result.payload) { this.payload = result.payload; };
if(result.topic) { this.topic = result.topic; };
if(result.hasOwnProperty('payloadType')) { this.payloadType = result.payloadType; };
if(result.hasOwnProperty('payload')) { this.payload = result.payload; };
if(result.hasOwnProperty('topic')) { this.topic = result.topic; };
},
button: {
enabled: function() {

4
packages/node_modules/@node-red/nodes/core/function/10-function.html vendored
View File

@@ -512,6 +512,7 @@
return function(e) {
e.preventDefault();
var value = editor.getValue();
var extraLibs = that.libs || [];
RED.editor.editJavaScript({
value: value,
width: "Infinity",
@@ -523,7 +524,8 @@
setTimeout(function() {
editor.focus();
},300);
}
},
extraLibs: extraLibs
})
}
}

3
packages/node_modules/@node-red/nodes/core/function/10-function.js vendored
View File

@@ -234,8 +234,7 @@ module.exports = function(RED) {
},
env: {
get: function(envVar) {
var flow = node._flow;
return flow.getSetting(envVar);
return RED.util.getSetting(node, envVar);
}
},
setTimeout: function () {

2
packages/node_modules/@node-red/nodes/core/function/rbe.js vendored
View File

@@ -58,7 +58,7 @@ module.exports = function(RED) {
else {
var n = parseFloat(value);
if (!isNaN(n)) {
if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband")) {
if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband" || this.func === "narrowbandEq")) {
if (node.start === '') { node.previous[t] = n; }
else { node.previous[t] = node.start; }
}

2
packages/node_modules/@node-red/nodes/core/network/21-httprequest.js vendored
View File

@@ -302,6 +302,8 @@ in your Node-RED user directory (${RED.settings.userDir}).
// var cred = ""
if (this.credentials.user || this.credentials.password) {
// cred = `${this.credentials.user}:${this.credentials.password}`;
if (this.credentials.user === undefined) { this.credentials.user = ""}
if (this.credentials.password === undefined) { this.credentials.password = ""}
opts.headers.Authorization = "Basic " + Buffer.from(`${this.credentials.user}:${this.credentials.password}`).toString("base64");
}
// build own basic auth header