From 2816b3edaebe5b0c39d591daa80e503a6dc7cbff Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 17 Oct 2018 13:45:57 +0100
Subject: [PATCH] Add tooltip to flow add button

---
 .../editor-client/locales/en-US/editor.json      |  1 +
 .../editor-client/src/js/ui/common/tabs.js       | 16 +++++++++++++---
 .../editor-client/src/js/ui/workspaces.js        | 11 +++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index 9a8800df5..304b9436d 100644
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -23,6 +23,7 @@
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
+        "addFlow": "Add Flow",
         "status": "Status",
         "enabled": "Enabled",
         "disabled":"Disabled",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 7252d0998..02736a9b4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -34,14 +34,24 @@ RED.tabs = (function() {
         if (options.vertical) {
             wrapper.addClass("red-ui-tabs-vertical");
         }
-        if (options.addButton && typeof options.addButton === 'function') {
+        if (options.addButton) {
             wrapper.addClass("red-ui-tabs-add");
             var addButton = $('<div class="red-ui-tab-button"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
             addButton.find('a').click(function(evt) {
                 evt.preventDefault();
-                options.addButton();
+                if (typeof options.addButton === 'function') {
+                    options.addButton();
+                } else if (typeof options.addButton === 'string') {
+                    RED.actions.invoke(options.addButton);
+                }
             })
-
+            if (typeof options.addButton === 'string') {
+                var l = options.addButton;
+                if (options.addButtonCaption) {
+                    l = options.addButtonCaption
+                }
+                RED.popover.tooltip(addButton,l,options.addButton);
+            }
         }
         var scrollLeft;
         var scrollRight;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index bb8fac23b..b6b2898f2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -289,9 +289,8 @@ RED.workspaces = (function() {
             },
             minimumActiveTabWidth: 150,
             scrollable: true,
-            addButton: function() {
-                addWorkspace();
-            }
+            addButton: "core:add-flow",
+            addButtonCaption: RED._("workspace.addFlow")
         });
         workspaceTabCount = 0;
     }
@@ -339,9 +338,9 @@ RED.workspaces = (function() {
             if (workspace_tabs.contains(ws.id)) {
                 workspace_tabs.removeTab(ws.id);
             }
-        }
-        if (ws.id === activeWorkspace) {
-            activeWorkspace = 0;
+            if (ws.id === activeWorkspace) {
+                activeWorkspace = 0;
+            }
         }
     }