From ca91a5dd95374c7a0de7d279ce72cf9ff99bc50d Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sun, 27 Sep 2015 20:18:21 +0100
Subject: [PATCH] Rename flow menu ids back to workspace

---
 editor/js/history.js       |  2 +-
 editor/js/main.js          |  8 ++++----
 editor/js/ui/editor.js     |  2 +-
 editor/js/ui/view.js       |  4 ++--
 editor/js/ui/workspaces.js | 14 +++++++-------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/editor/js/history.js b/editor/js/history.js
index 83574eb37..d5f49f2c6 100644
--- a/editor/js/history.js
+++ b/editor/js/history.js
@@ -203,7 +203,7 @@ RED.history = (function() {
                         });
 
                         if (ev.node.type === 'subflow') {
-                            $("#menu-item-flow-menu-"+ev.node.id.replace(".","-")).text(ev.node.name);
+                            $("#menu-item-workspace-menu-"+ev.node.id.replace(".","-")).text(ev.node.name);
                         }
                     } else {
                         RED.editor.updateNodeProperties(ev.node);
diff --git a/editor/js/main.js b/editor/js/main.js
index a633e9bad..6cc8f8d6e 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -180,10 +180,10 @@ var RED = (function() {
                     {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow},
                 ]},
                 null,
-                {id:"menu-item-flow",label:RED._("menu.label.flows"),options:[
-                    {id:"menu-item-flow-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
-                    {id:"menu-item-flow-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
-                    {id:"menu-item-flow-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove},
+                {id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
+                    {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add},
+                    {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit},
+                    {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove},
                     null
                 ]},
                 null,
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index 12fa9260f..0a0498807 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -1063,7 +1063,7 @@ RED.editor = (function() {
                                 changes['name'] = editing_node.name;
                                 editing_node.name = newName;
                                 changed = true;
-                                $("#menu-item-flow-menu-"+editing_node.id.replace(".","-")).text(newName);
+                                $("#menu-item-workspace-menu-"+editing_node.id.replace(".","-")).text(newName);
                             }
 
                             RED.palette.refresh();
diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 7c8a2b0bc..7995bbe4f 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -256,8 +256,8 @@ RED.view = (function() {
 
             activeSubflow = RED.nodes.subflow(event.workspace);
 
-            RED.menu.setDisabled("menu-item-flow-edit", activeSubflow);
-            RED.menu.setDisabled("menu-item-flow-delete",RED.workspaces.count() == 1 || activeSubflow);
+            RED.menu.setDisabled("menu-item-workspace-edit", activeSubflow);
+            RED.menu.setDisabled("menu-item-workspace-delete",RED.workspaces.count() == 1 || activeSubflow);
 
             if (workspaceScrollPositions[event.workspace]) {
                 chart.scrollLeft(workspaceScrollPositions[event.workspace].left);
diff --git a/editor/js/ui/workspaces.js b/editor/js/ui/workspaces.js
index 57730c733..a369f5fa9 100644
--- a/editor/js/ui/workspaces.js
+++ b/editor/js/ui/workspaces.js
@@ -100,18 +100,18 @@ RED.workspaces = (function() {
                 }
             },
             onadd: function(tab) {
-                RED.menu.addItem("menu-item-flow",{
-                    id:"menu-item-flow-menu-"+tab.id.replace(".","-"),
+                RED.menu.addItem("menu-item-workspace",{
+                    id:"menu-item-workspace-menu-"+tab.id.replace(".","-"),
                     label:tab.label,
                     onselect:function() {
                         workspace_tabs.activateTab(tab.id);
                     }
                 });
-                RED.menu.setDisabled("menu-item-flow-delete",workspace_tabs.count() == 1);
+                RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1);
             },
             onremove: function(tab) {
-                RED.menu.setDisabled("menu-item-flow-delete",workspace_tabs.count() == 1);
-                RED.menu.removeItem("menu-item-flow-menu-"+tab.id.replace(".","-"));
+                RED.menu.setDisabled("menu-item-workspace-delete",workspace_tabs.count() == 1);
+                RED.menu.removeItem("menu-item-workspace-menu-"+tab.id.replace(".","-"));
             },
             minimumActiveTabWidth: 150
         });
@@ -141,7 +141,7 @@ RED.workspaces = (function() {
                         if (workspace.label != label) {
                             workspace_tabs.renameTab(workspace.id,label);
                             RED.nodes.dirty(true);
-                            $("#menu-item-flow-menu-"+workspace.id.replace(".","-")).text(label);
+                            $("#menu-item-workspace-menu-"+workspace.id.replace(".","-")).text(label);
                             // TODO: update entry in menu
                         }
                         $( this ).dialog( "close" );
@@ -209,7 +209,7 @@ RED.workspaces = (function() {
 
         });
 
-        RED.menu.setAction('menu-item-flow-delete',function() {
+        RED.menu.setAction('menu-item-workspace-delete',function() {
             deleteWorkspace(RED.nodes.workspace(activeWorkspace));
         });