Merge branch 'dev' into pr_4031

This commit is contained in:
Nick O'Leary
2023-01-30 09:52:31 +00:00
4 changed files with 6 additions and 3 deletions

View File

@@ -829,7 +829,7 @@ RED.tabs = (function() {
event.preventDefault();
removeTab(tab.id);
});
RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
RED.popover.tooltip(closeLink,RED._("workspace.closeFlow"));
}
// if (tab.hideable) {
// 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(
{
label: RED._("workspace.moveToStart"),
@@ -274,7 +274,8 @@ RED.workspaces = (function() {
} else if (tab.type === 'subflow') {
RED.subflow.delete(tab.id)
}
}
},
disabled: (workspaceTabCount === 1)
},
{
label: RED._("menu.label.export"),