From 5b9806dc0dd9bb419421c4345f45c2d2e0902309 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 22 Oct 2014 10:37:17 -0700
Subject: [PATCH] Fix deletion with multi-selection

---
 examples/libraries/entitySelectionTool.js | 2 +-
 examples/newEditEntities.js               | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js
index 0153f7fc3d..f4f068742f 100644
--- a/examples/libraries/entitySelectionTool.js
+++ b/examples/libraries/entitySelectionTool.js
@@ -927,7 +927,7 @@ SelectionDisplay = (function () {
     };
 
     that.updateHandles = function(entityID) {
-        if (!entitySelected) {
+        if (SelectionManager.selections.length == 0) {
             that.setOverlaysVisible(false);
             return;
         }
diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js
index 9b46cdaf3f..402ad94417 100644
--- a/examples/newEditEntities.js
+++ b/examples/newEditEntities.js
@@ -608,9 +608,12 @@ function handeMenuEvent(menuItem) {
     } else if (menuItem == "Delete") {
         if (entitySelected) {
             print("  Delete Entity.... selectedEntityID="+ selectedEntityID);
-            Entities.deleteEntity(selectedEntityID);
+            for (var i = 0; i < selectionManager.selections.length; i++) {
+                Entities.deleteEntity(selectionManager.selections[i]);
+            }
             selectionDisplay.unselect(selectedEntityID);
             entitySelected = false;
+            selectionManager.clearSelections();
         } else {
             print("  Delete Entity.... not holding...");
         }
@@ -653,7 +656,7 @@ Controller.keyReleaseEvent.connect(function (event) {
     if (event.text == "`") {
         handeMenuEvent("Edit Properties...");
     }
-    if (event.text == "BACKSPACE") {
+    if (event.text == "BACKSPACE" || event.text == "DELETE") {
         handeMenuEvent("Delete");
     } else if (event.text == "TAB") {
         selectionDisplay.toggleSpaceMode();