From f6f4b0784b403606c5f2eba8c6c46acd937d1e94 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Sat, 17 Jan 2015 21:02:28 +0000
Subject: [PATCH] Make subflow delete option more obvious Fixes #514

---
 public/index.html       |  3 ++-
 public/red/ui/editor.js | 39 ---------------------------------------
 public/red/ui/view.js   | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/public/index.html b/public/index.html
index f09db2039..d6c2f463b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -54,9 +54,10 @@
         <div id="workspace-add-tab"><a id="btn-workspace-add-tab" href="#"><i class="fa fa-plus"></i></a></div>
         <div id="chart"></div>
         <div id="workspace-toolbar">
-            <a class="button" id="workspace-subflow-edit" href="#"><i class="fa fa-pencil"></i> edit subflow name</a>
+            <a class="button" id="workspace-subflow-edit" href="#"><i class="fa fa-pencil"></i> edit name</a>
             <a class="button disabled" id="workspace-subflow-add-input" href="#"><i class="fa fa-plus"></i> input</a>
             <a class="button" id="workspace-subflow-add-output" href="#"><i class="fa fa-plus"></i> output</a>
+            <a class="button" id="workspace-subflow-delete" href="#"><i class="fa fa-trash"></i> delete subflow</a>
         </div>
     </div>
 
diff --git a/public/red/ui/editor.js b/public/red/ui/editor.js
index 3e30343c2..3e121a968 100644
--- a/public/red/ui/editor.js
+++ b/public/red/ui/editor.js
@@ -700,45 +700,6 @@ RED.editor = (function() {
         closeOnEscape: false,
         width: 500,
         buttons: [
-            {
-                class: 'leftButton',
-                text: "Delete",
-                click: function() {
-                    var removedNodes = [];
-                    var removedLinks = [];
-                    var startDirty = RED.view.dirty();
-
-                    RED.nodes.eachNode(function(n) {
-                        if (n.type == "subflow:"+editing_node.id) {
-                            removedNodes.push(n);
-                        }
-                        if (n.z == editing_node.id) {
-                            removedNodes.push(n);
-                        }
-                    });
-                    
-                    for (var i=0;i<removedNodes.length;i++) {
-                        var rmlinks = RED.nodes.remove(removedNodes[i].id);
-                        removedLinks = removedLinks.concat(rmlinks);
-                    }
-                    
-                    RED.nodes.removeSubflow(editing_node);
-                    
-                    RED.view.removeWorkspace(editing_node);
-                    
-                    RED.history.push({
-                        t:'delete',
-                        nodes:removedNodes,
-                        links:removedLinks,
-                        subflow: editing_node,
-                        dirty:startDirty
-                    });
-                    RED.view.dirty(true);
-                    RED.view.redraw();
-
-                    $( this ).dialog( "close" );
-                }
-            },
             {
                 id: "subflow-dialog-ok",
                 text: "Ok",
diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index d7a6822ef..164ecbeeb 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -246,6 +246,41 @@ RED.view = (function() {
         addSubflowOutput(activeSubflow.id);
     });
     
+    $("#workspace-subflow-delete").click(function(event) {
+        event.preventDefault();
+        var removedNodes = [];
+        var removedLinks = [];
+        var startDirty = RED.view.dirty();
+        
+        RED.nodes.eachNode(function(n) {
+            if (n.type == "subflow:"+activeSubflow.id) {
+                removedNodes.push(n);
+            }
+            if (n.z == activeSubflow.id) {
+                removedNodes.push(n);
+            }
+        });
+        
+        for (var i=0;i<removedNodes.length;i++) {
+            var rmlinks = RED.nodes.remove(removedNodes[i].id);
+            removedLinks = removedLinks.concat(rmlinks);
+        }
+        
+        RED.nodes.removeSubflow(activeSubflow);
+        
+        RED.history.push({
+                t:'delete',
+                nodes:removedNodes,
+                links:removedLinks,
+                subflow: activeSubflow,
+                dirty:startDirty
+        });
+        
+        RED.view.removeWorkspace(activeSubflow);
+        RED.view.dirty(true);
+        RED.view.redraw();
+    });
+    
     var workspace_tabs = RED.tabs.create({
         id: "workspace-tabs",
         onchange: function(tab) {