Default config nodes to global scope unless in a subflow

knolleary · knolleary · commit d7d30aa9725a · 2016-08-26T13:26:42.000+01:00
Closes node-red#972
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
@@ -776,16 +776,17 @@ RED.editor = (function() {
         } else {
             ns = node_def.set.id;
         }
-        var activeWorkspace = RED.nodes.workspace(RED.workspaces.active());
-        if (!activeWorkspace) {
-            activeWorkspace = RED.nodes.subflow(RED.workspaces.active());
+        var configNodeScope = ""; // default to global
+        var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
+        if (activeSubflow) {
+            configNodeScope = activeSubflow.id;
         }
         if (editing_config_node == null) {
             editing_config_node = {
                 id: RED.nodes.id(),
                 _def: node_def,
                 type: type,
-                z: activeWorkspace.id,
+                z: configNodeScope,
                 users: []
             }
             for (var d in node_def.defaults) {
diff --git a/editor/sass/editor.scss b/editor/sass/editor.scss
@@ -255,7 +255,7 @@
     margin: 1px 0 0 0;
     padding: 0;
     height: 22px;
-    width: 150px;
+    width: 200px;
 
 }
 #node-config-dialog-user-count {
diff --git a/red/api/locales/en-US/editor.json b/red/api/locales/en-US/editor.json
@@ -267,7 +267,7 @@
         "config": {
             "name": "Configuration nodes",
             "label": "config",
-            "global": "Global",
+            "global": "On all flows",
             "none": "none",
             "subflows": "subflows",
             "flows": "flows",

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@`
`255`	`255`	`margin: 1px 0 0 0;`
`256`	`256`	`padding: 0;`
`257`	`257`	`height: 22px;`
`258`		`- width: 150px;`
	`258`	`+ width: 200px;`
`259`	`259`
`260`	`260`	`}`
`261`	`261`	`#node-config-dialog-user-count {`