From edfd6f12d6e647af1c94436be0413099ac3b4d6c Mon Sep 17 00:00:00 2001
From: Dan Elbert <dan.elbert@gmail.com>
Date: Sat, 30 Jan 2016 21:35:39 -0600
Subject: [PATCH] more bulk editor work

---
 app/assets/javascripts/recipe_editor.js | 8 ++++++--
 app/views/recipes/index.html.erb        | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/recipe_editor.js b/app/assets/javascripts/recipe_editor.js
index f39dd74..9ab260e 100644
--- a/app/assets/javascripts/recipe_editor.js
+++ b/app/assets/javascripts/recipe_editor.js
@@ -173,7 +173,9 @@
         initializeStepEditor(item);
       })
       .on("cocoon:after-remove", function(e, item) {
-        item.detach().appendTo("#deleted_steps");
+        if (item.find(".remove-button.existing").length) {
+          item.detach().appendTo("#deleted_steps");
+        }
         reorder($(this));
       })
       .on('changed', 'input.sort_order', function() {
@@ -191,7 +193,9 @@
         initializeIngredientEditor(item, ingredientSearchEngine);
       })
       .on("cocoon:after-remove", function(e, item) {
-        item.detach().appendTo("#deleted_ingredients");
+        if (item.find(".remove-button.existing").length) {
+          item.detach().appendTo("#deleted_ingredients");
+        }
         reorder($ingredientList);
       })
       .on("typeahead:change", function(evt, value) {
diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb
index edb43d4..a6e517d 100644
--- a/app/views/recipes/index.html.erb
+++ b/app/views/recipes/index.html.erb
@@ -15,7 +15,7 @@
             <tr>
               <th>Name</th>
               <% if current_user? %>
-                <th colspan="2"></th>
+                <th></th>
               <% end %>
               <th>Yields</th>
               <th>Time</th>
@@ -34,8 +34,6 @@
                     <%= link_to edit_recipe_path(recipe), class: 'btn btn-sm btn-primary' do %>
                       <span class="glyphicon glyphicon-pencil"></span>
                     <% end %>
-                  </td>
-                  <td>
                     <%= link_to recipe, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-sm btn-danger' do %>
                       <span class="glyphicon glyphicon-remove"></span>
                     <% end %>