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
2019-09-06 10:49:27 +01:00
parent 28bda9fa41 f7e9c109f6
commit d963dfdbb6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ RED.workspaces = (function() {
RED.view.state(RED.state.EDITING);
var tabflowEditor;
var trayOptions = {
title: RED._("workspace.editFlow",{name:workspace.label}),
title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}),
buttons: [
{
id: "node-dialog-delete",

2
packages/node_modules/node-red/lib/red.js vendored
View File

@@ -76,7 +76,7 @@ module.exports = {
apiEnabled = true;
server = httpServer;
} else {
runtime.init(userSettings);
runtime.init(userSettings, httpServer);
apiEnabled = false;
if (httpServer) {
server = httpServer;