1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge branch 'dev' into pr_4031

This commit is contained in:
Nick O'Leary 2023-01-30 09:52:31 +00:00
commit 2759c1616c
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 6 additions and 3 deletions

View File

@ -55,6 +55,7 @@
"dropFlowHere": "Drop the flow here", "dropFlowHere": "Drop the flow here",
"addFlow": "Add flow", "addFlow": "Add flow",
"addFlowToRight": "Add flow to the right", "addFlowToRight": "Add flow to the right",
"closeFlow": "Close flow",
"hideFlow": "Hide flow", "hideFlow": "Hide flow",
"hideOtherFlows": "Hide other flows", "hideOtherFlows": "Hide other flows",
"showAllFlows": "Show all flows (__count__ hidden)", "showAllFlows": "Show all flows (__count__ hidden)",

View File

@ -55,6 +55,7 @@
"dropFlowHere": "ここにフローをドロップしてください", "dropFlowHere": "ここにフローをドロップしてください",
"addFlow": "フローの追加", "addFlow": "フローの追加",
"addFlowToRight": "右側にフローを追加", "addFlowToRight": "右側にフローを追加",
"closeFlow": "フローを閉じる",
"hideFlow": "フローを非表示", "hideFlow": "フローを非表示",
"hideOtherFlows": "他のフローを非表示", "hideOtherFlows": "他のフローを非表示",
"showAllFlows": "全てのフローを表示", "showAllFlows": "全てのフローを表示",

View File

@ -829,7 +829,7 @@ RED.tabs = (function() {
event.preventDefault(); event.preventDefault();
removeTab(tab.id); removeTab(tab.id);
}); });
RED.popover.tooltip(closeLink,RED._("workspace.hideFlow")); RED.popover.tooltip(closeLink,RED._("workspace.closeFlow"));
} }
// if (tab.hideable) { // if (tab.hideable) {
// li.addClass("red-ui-tabs-closeable") // li.addClass("red-ui-tabs-closeable")

View File

@ -201,7 +201,7 @@ RED.workspaces = (function() {
} }
) )
} }
const activeIndex = currentTabs.findIndex(id => id === activeWorkspace.id) const activeIndex = currentTabs.findIndex(id => (activeWorkspace && (id === activeWorkspace.id)));
menuItems.push( menuItems.push(
{ {
label: RED._("workspace.moveToStart"), label: RED._("workspace.moveToStart"),
@ -274,7 +274,8 @@ RED.workspaces = (function() {
} else if (tab.type === 'subflow') { } else if (tab.type === 'subflow') {
RED.subflow.delete(tab.id) RED.subflow.delete(tab.id)
} }
} },
disabled: (workspaceTabCount === 1)
}, },
{ {
label: RED._("menu.label.export"), label: RED._("menu.label.export"),