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 allow-number-user-properties-mqtt

Browse Source
This commit is contained in:
Ben Hardill
2024-10-01 16:35:56 +01:00
committed by GitHub
parent e3acc49d5e c3da827222
commit 34d8b3ed5e
19 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/editor-api",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"main": "./lib/index.js",
"repository": {
@@ -16,14 +16,14 @@
}
],
"dependencies": {
"@node-red/util": "4.0.2",
"@node-red/editor-client": "4.0.2",
"@node-red/util": "4.0.3",
"@node-red/editor-client": "4.0.3",
"bcryptjs": "2.4.3",
"body-parser": "1.20.2",
"body-parser": "1.20.3",
"clone": "2.1.2",
"cors": "2.8.5",
"express-session": "1.18.0",
"express": "4.19.2",
"express": "4.21.0",
"memorystore": "1.6.7",
"mime": "3.0.0",
"multer": "1.4.5-lts.1",

4
packages/node_modules/@node-red/editor-client/locales/en-US/editor.json vendored
View File

@@ -562,7 +562,9 @@
"types": {
"local": "Local",
"examples": "Examples"
}
},
"type": "Type",
"name": "Name"
},
"palette": {
"noInfo": "no information available",

4
packages/node_modules/@node-red/editor-client/locales/ja/editor.json vendored
View File

@@ -562,7 +562,9 @@
"types": {
"local": "ローカル",
"examples": "サンプル"
}
},
"type": "型",
"name": "名前"
},
"palette": {
"noInfo": "情報がありません",

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/editor-client",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"repository": {
"type": "git",

4
packages/node_modules/@node-red/editor-client/src/js/ui/library.js vendored
View File

@@ -839,10 +839,10 @@ RED.library = (function() {
if (file && file.label && !file.children) {
$.get("library/"+file.library+"/"+file.type+"/"+file.path, function(data) {
//TODO: nls + sanitize
var propRow = $('<tr class="red-ui-help-info-row"><td>Type</td><td></td></tr>').appendTo(table);
var propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.type")+'</td><td></td></tr>').appendTo(table);
$(propRow.children()[1]).text(activeLibrary.type);
if (file.props.hasOwnProperty('name')) {
propRow = $('<tr class="red-ui-help-info-row"><td>Name</td><td>'+file.props.name+'</td></tr>').appendTo(table);
propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("library.name")+'</td><td>'+file.props.name+'</td></tr>').appendTo(table);
$(propRow.children()[1]).text(file.props.name);
}
for (var p in file.props) {

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

@@ -204,7 +204,7 @@ RED.sidebar.info = (function() {
propertiesPanelHeaderIcon.empty();
RED.utils.createNodeIcon({type:"_selection_"}).appendTo(propertiesPanelHeaderIcon);
propertiesPanelHeaderLabel.text("Selection");
propertiesPanelHeaderLabel.text(RED._("sidebar.info.selection"));
propertiesPanelHeaderReveal.hide();
propertiesPanelHeaderHelp.hide();
propertiesPanelHeaderCopyLink.hide();

10
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@@ -1209,7 +1209,10 @@ RED.view = (function() {
lasso = null;
}
if (d3.event.touches || d3.event.button === 0) {
if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
if (
(mouse_mode === 0 && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) ||
mouse_mode === RED.state.QUICK_JOINING
) {
// Trigger quick add dialog
d3.event.stopPropagation();
clearSelection();
@@ -1285,7 +1288,6 @@ RED.view = (function() {
}
var mainPos = $("#red-ui-main-container").position();
if (mouse_mode !== RED.state.QUICK_JOINING) {
mouse_mode = RED.state.QUICK_JOINING;
$(window).on('keyup',disableQuickJoinEventHandler);
@@ -3057,8 +3059,8 @@ RED.view = (function() {
}
function disableQuickJoinEventHandler(evt) {
// Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari)
if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91) {
// Check for ctrl (all browsers), "Meta" (Chrome/FF), keyCode 91 (Safari), or Escape
if (evt.keyCode === 17 || evt.key === "Meta" || evt.keyCode === 91 || evt.keyCode === 27) {
resetMouseVars();
hideDragLines();
redraw();

11
packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js vendored
View File

@@ -920,6 +920,17 @@ RED.workspaces = (function() {
}
},
refresh: function() {
var workspace = RED.nodes.workspace(RED.workspaces.active());
if (workspace) {
document.title = `${documentTitle} : ${workspace.label}`;
} else {
var subflow = RED.nodes.subflow(RED.workspaces.active());
if (subflow) {
document.title = `${documentTitle} : ${subflow.name}`;
} else {
document.title = documentTitle
}
}
RED.nodes.eachWorkspace(function(ws) {
workspace_tabs.renameTab(ws.id,ws.label);
$("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)

14
packages/node_modules/@node-red/nodes/core/network/05-tls.js vendored
View File

@@ -104,14 +104,14 @@ module.exports = function(RED) {
if (this.credentials && this.credentials.passphrase) {
opts.passphrase = this.credentials.passphrase;
}
if (this.servername) {
opts.servername = this.servername;
}
if (this.alpnprotocol) {
opts.ALPNProtocols = [this.alpnprotocol];
}
opts.rejectUnauthorized = this.verifyservercert;
}
if (this.servername) {
opts.servername = this.servername;
}
if (this.alpnprotocol) {
opts.ALPNProtocols = [this.alpnprotocol];
}
opts.rejectUnauthorized = this.verifyservercert;
return opts;
}

0
packages/node_modules/@node-red/nodes/examples/parser/html/04 - Join extracedt sequence of HTML element using join node.json → packages/node_modules/@node-red/nodes/examples/parser/html/04 - Join extracted sequence of HTML element using join node.json vendored
View File

2
packages/node_modules/@node-red/nodes/locales/en-US/messages.json vendored
View File

@@ -456,7 +456,7 @@
"staticTopic": "Subscribe to single topic",
"dynamicTopic": "Dynamic subscription",
"auto-connect": "Connect automatically",
"auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode.",
"auto-mode-depreciated": "This option is deprecated. Please use the new auto-detect mode.",
"none": "none",
"other": "other"
},

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/nodes",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"repository": {
"type": "git",
@@ -15,10 +15,10 @@
}
],
"dependencies": {
"acorn": "8.11.3",
"acorn-walk": "8.3.2",
"ajv": "8.14.0",
"body-parser": "1.20.2",
"acorn": "8.12.1",
"acorn-walk": "8.3.4",
"ajv": "8.17.1",
"body-parser": "1.20.3",
"cheerio": "1.0.0-rc.10",
"content-type": "1.0.5",
"cookie-parser": "1.4.6",
@@ -41,7 +41,7 @@
"node-watch": "0.7.4",
"on-headers": "1.0.2",
"raw-body": "2.5.2",
"tough-cookie": "4.1.4",
"tough-cookie": "^5.0.0",
"uuid": "9.0.1",
"ws": "7.5.10",
"xml2js": "0.6.2",

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/registry",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"main": "./lib/index.js",
"repository": {
@@ -16,7 +16,7 @@
}
],
"dependencies": {
"@node-red/util": "4.0.2",
"@node-red/util": "4.0.3",
"clone": "2.1.2",
"fs-extra": "11.2.0",
"semver": "7.5.4",

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/runtime",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"main": "./lib/index.js",
"repository": {
@@ -16,11 +16,11 @@
}
],
"dependencies": {
"@node-red/registry": "4.0.2",
"@node-red/util": "4.0.2",
"@node-red/registry": "4.0.3",
"@node-red/util": "4.0.3",
"async-mutex": "0.5.0",
"clone": "2.1.2",
"express": "4.19.2",
"express": "4.21.0",
"fs-extra": "11.2.0",
"json-stringify-safe": "5.0.1",
"rfdc": "^1.3.1"

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

@@ -1,6 +1,6 @@
{
"name": "@node-red/util",
"version": "4.0.2",
"version": "4.0.3",
"license": "Apache-2.0",
"repository": {
"type": "git",