From d7ad2659d7ef8d0fffbb1cba8218061ebd516dd0 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 3 Feb 2012 15:09:54 -0800
Subject: Handle delete of multiple objects. Also, have deletion go through the
 mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to
 clean up after deleted element(s).

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/mediators/element-mediator.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'js/mediators/element-mediator.js')

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index b2bc5355..992ac620 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -44,12 +44,16 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 this.deleteDelegate.handleDelete();
             } else {
                 // Add the Undo/Redo
-                var els = [];
+                var els = [],
+                    len = this.application.ninja.selectedElements.length;
 
-                if(this.application.ninja.selectedElements.length > 0) {
-                    for(var i=0, item; item = this.application.ninja.selectedElements[i]; i++) {
-                        ElementController.removeElement(item._element);
-                        els.push(item._element);
+                if(len) {
+                    for(var i = 0; i<len; i++)
+                    {
+                        els.push(this.application.ninja.selectedElements[i]);
+                    }
+                    for(i=0; i<len; i++) {
+                        this._removeElement(els[i]._element);
                     }
 
                     NJevent( "deleteSelection", els );
-- 
cgit v1.2.3