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
2021-01-07 10:17:50 +00:00
parent 87c9ed6356 06ceb056f3
commit 7913b3cbc2
17 changed files with 167 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/node_modules/@node-red/editor-api/package.json vendored
View File

@@ -25,9 +25,9 @@
"express-session": "1.17.1",
"express": "4.17.1",
"memorystore": "1.6.4",
"mime": "2.4.6",
"mime": "2.4.7",
"multer": "1.4.2",
"mustache": "4.0.1",
"mustache": "4.1.0",
"oauth2orize": "1.11.0",
"passport-http-bearer": "1.0.1",
"passport-oauth2-client-password": "0.1.2",

2
packages/node_modules/@node-red/editor-client/locales/de/editor.json vendored
View File

@@ -32,7 +32,7 @@
"label" : {
"view" : {
"view" : "Ansicht",
"grid" : "Gitter",
"grid" : "Raster",
"showGrid" : "Raster anzeigen",
"snapGrid" : "Am Raster ausrichten",
"gridSize" : "Rastergröße",

2
packages/node_modules/@node-red/editor-client/src/js/nodes.js vendored
View File

@@ -1360,7 +1360,7 @@ RED.nodes = (function() {
}
}
} else {
if (n.z && !workspaces[n.z]) {
if (n.z && !workspaces[n.z] && !subflow_map[n.z]) {
n.z = activeWorkspace;
}
}

12
packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js vendored
View File

@@ -965,6 +965,18 @@
},
hide: function() {
this.uiSelect.hide();
},
disable: function(val) {
if(val === true) {
this.uiSelect.attr("disabled", "disabled");
} else if (val === false) {
this.uiSelect.attr("disabled", null); //remove attr
} else {
this.uiSelect.attr("disabled", val); //user value
}
},
disabled: function() {
return this.uiSelect.attr("disabled");
}
});
})(jQuery);

2
packages/node_modules/@node-red/editor-client/src/js/user.js vendored
View File

@@ -219,7 +219,7 @@ RED.user = (function() {
function init() {
if (RED.settings.user) {
if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu")) {
if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu") || RED.settings.editorTheme.userMenu) {
var userMenu = $('<li><a id="red-ui-header-button-user" class="button hide" href="#"></a></li>')
.prependTo(".red-ui-header-toolbar");

8
packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss vendored
View File

@@ -26,6 +26,14 @@
box-sizing: border-box;
overflow:visible;
position: relative;
&[disabled] {
input, button {
background: $secondary-background-inactive;
pointer-events: none;
cursor: not-allowed;
}
}
.red-ui-typedInput-input-wrap {
flex-grow: 1;
}

4
packages/node_modules/@node-red/nodes/locales/de/messages.json vendored
View File

@@ -583,11 +583,11 @@
"regex" : "Reguläre Ausdrücke verwenden"
},
"action" : {
"set" : "Festlegen",
"set" : "Setze",
"change" : "Ändern",
"delete" : "Löschen",
"move" : "Bewegen",
"to" : "bis",
"to" : "auf",
"search" : "Suchen nach",
"replace" : "Ersetzen durch"
},

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

@@ -23,7 +23,7 @@
"cookie": "0.4.1",
"cors": "2.8.5",
"cron": "1.7.2",
"denque": "1.4.1",
"denque": "1.5.0",
"fs-extra": "8.1.0",
"fs.notify": "0.0.4",
"hash-sum": "2.0.0",
@@ -33,7 +33,7 @@
"media-typer": "1.1.0",
"mqtt": "4.2.6",
"multer": "1.4.2",
"mustache": "4.0.1",
"mustache": "4.1.0",
"on-headers": "1.0.2",
"raw-body": "2.4.1",
"request": "2.88.0",

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

@@ -19,6 +19,6 @@
"@node-red/util": "1.3.0-beta.1",
"semver": "6.3.0",
"tar": "6.0.5",
"uglify-js": "3.11.6"
"uglify-js": "3.12.4"
}
}

4
packages/node_modules/@node-red/runtime/lib/flows/Flow.js vendored
View File

@@ -470,8 +470,8 @@ class Flow {
}
// console.log("HE",logMessage);
var count = 1;
if (msg && msg.hasOwnProperty("error") && msg.error !== null) {
if (msg.error.hasOwnProperty("source") && msg.error.source !== null) {
if (msg && msg.hasOwnProperty("error") && msg.error) {
if (msg.error.hasOwnProperty("source") && msg.error.source) {
if (msg.error.source.id === node.id) {
count = msg.error.source.count+1;
if (count === 10) {

4
packages/node_modules/@node-red/runtime/lib/flows/Subflow.js vendored
View File

@@ -112,8 +112,8 @@ class Subflow extends Flow {
this.node_map = node_map;
this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id);
this.templateCredentials = credentials.get(subflowDef.id);
this.instanceCredentials = credentials.get(this.id);
this.templateCredentials = credentials.get(subflowDef.id) || {};
this.instanceCredentials = credentials.get(this.id) || {};
var env = [];
if (this.subflowDef.env) {

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

@@ -18,7 +18,7 @@
"dependencies": {
"@node-red/registry": "1.3.0-beta.1",
"@node-red/util": "1.3.0-beta.1",
"async-mutex": "0.2.4",
"async-mutex": "0.2.6",
"clone": "2.1.2",
"express": "4.17.1",
"fs-extra": "8.1.0",