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 pull request #4644 from node-red/resyn-dev

Browse Source 
Resync recent fixes from master to dev
This commit is contained in:
Nick O'Leary 2024-04-03 14:02:17 +01:00 committed by GitHub
commit 343cde75a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -29,6 +29,15 @@ Nodes
- Let debug node status msg length be settable via settings (#4402) @dceejay - Let debug node status msg length be settable via settings (#4402) @dceejay
- Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies - Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies
#### 3.1.8: Maintenance Release
- Add validation and error handling on subflow instance properties (#4632) @knolleary
- Hide import/export context menu if disabled in theme (#4633) @knolleary
- Show change indicator on subflow tabs (#4631) @knolleary
- Bump dependencies (#4630) @knolleary
- Reset workspace index when clearing nodes (#4619) @knolleary
- Remove typo in global config (#4613) @kazuhitoyokoi
#### 3.1.7: Maintenance Release #### 3.1.7: Maintenance Release
- Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi - Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi

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

@ -158,9 +158,11 @@ RED.sidebar.help = (function() {
function refreshSubflow(sf) { function refreshSubflow(sf) {
var item = treeList.treeList('get',"node-type:subflow:"+sf.id); var item = treeList.treeList('get',"node-type:subflow:"+sf.id);
if (item) {
item.subflowLabel = sf._def.label().toLowerCase(); item.subflowLabel = sf._def.label().toLowerCase();
item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()})); item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
} }
}
function hideTOC() { function hideTOC() {
var tocButton = $('#red-ui-sidebar-help-show-toc') var tocButton = $('#red-ui-sidebar-help-show-toc')

2
packages/node_modules/@node-red/nodes/core/common/21-debug.html vendored
View File

@ -378,7 +378,7 @@
return { id: id, label: RED.nodes.workspace(id).label } //flow id + name return { id: id, label: RED.nodes.workspace(id).label } //flow id + name
} else { } else {
const instanceNode = RED.nodes.node(id) const instanceNode = RED.nodes.node(id)
const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name) const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8))?.name || instanceNode.type)
return { id: id, label: pathLabel } return { id: id, label: pathLabel }
} }
}) })