From fb5b45c65582d393cc736463b4f1150ac7ac5e04 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 24 Feb 2014 23:42:24 +0000
Subject: [PATCH] Tidy up tab switching

---
 public/red/ui/view.js | 70 +++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index d17e1f325..bc37c1acf 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -76,8 +76,36 @@ RED.view = function() {
             } else {
                 $("#workspace-toolbar").hide();
             }
-                
-            RED.view.setWorkspace(tab.id);
+            var chart = $("#chart");
+            if (activeWorkspace != 0) {
+                workspaceScrollPositions[activeWorkspace] = {
+                    left:chart.scrollLeft(),
+                    top:chart.scrollTop()
+                };
+            }
+            var scrollStartLeft = chart.scrollLeft();
+            var scrollStartTop = chart.scrollTop();
+            
+            activeWorkspace = tab.id;
+            if (workspaceScrollPositions[activeWorkspace]) {
+                chart.scrollLeft(workspaceScrollPositions[activeWorkspace].left);
+                chart.scrollTop(workspaceScrollPositions[activeWorkspace].top);
+            } else {
+                chart.scrollLeft(0);
+                chart.scrollTop(0);
+            }
+            var scrollDeltaLeft = chart.scrollLeft() - scrollStartLeft;
+            var scrollDeltaTop = chart.scrollTop() - scrollStartTop;
+            if (mouse_position != null) {
+                mouse_position[0] += scrollDeltaLeft;
+                mouse_position[1] += scrollDeltaTop;
+            }
+            
+            clearSelection();
+            RED.nodes.eachNode(function(n) {
+                    n.dirty = true;
+            });
+            redraw();
         },
         ondblclick: function(tab) {
             showRenameWorkspaceDialog(tab.id);
@@ -1236,38 +1264,6 @@ RED.view = function() {
         getWorkspace: function() {
             return activeWorkspace;
         },
-        setWorkspace: function(z) {
-            var chart = $("#chart");
-            if (activeWorkspace != 0) {
-                workspaceScrollPositions[activeWorkspace] = {
-                    left:chart.scrollLeft(),
-                    top:chart.scrollTop()
-                };
-            }
-            var scrollStartLeft = chart.scrollLeft();
-            var scrollStartTop = chart.scrollTop();
-
-            activeWorkspace = z;
-            if (workspaceScrollPositions[activeWorkspace]) {
-                chart.scrollLeft(workspaceScrollPositions[activeWorkspace].left);
-                chart.scrollTop(workspaceScrollPositions[activeWorkspace].top);
-            } else {
-                chart.scrollLeft(0);
-                chart.scrollTop(0);
-            }
-            var scrollDeltaLeft = chart.scrollLeft() - scrollStartLeft;
-            var scrollDeltaTop = chart.scrollTop() - scrollStartTop;
-            if (mouse_position != null) {
-                mouse_position[0] += scrollDeltaLeft;
-                mouse_position[1] += scrollDeltaTop;
-            }
-
-            clearSelection();
-            RED.nodes.eachNode(function(n) {
-                n.dirty = true;
-            });
-            redraw();
-        },
         redraw:redraw,
         dirty: function(d) {
             if (d == null) {
@@ -1279,12 +1275,6 @@ RED.view = function() {
         importNodes: importNodes,
         resize: function() {
             workspace_tabs.resize();
-        },
-        
-        addFlow: function() {
-            var ws = {type:"subflow",id:RED.nodes.id(),label:"Flow 1", closeable: true};
-            RED.nodes.addWorkspace(ws);
-            workspace_tabs.addTab(ws);
         }
     };
 }();