From a11ef2eed7049835c8bdfa50a2b893632c46eaa0 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 4 Apr 2012 11:11:58 -0700
Subject: Squashed commit of Preparing for the montage undo-manager:
 Architecture changes

Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/helper-classes/3D/draw-utils.js   | 79 +++++++++++++++++-------------------
 js/helper-classes/3D/snap-manager.js | 16 ++++++--
 2 files changed, 51 insertions(+), 44 deletions(-)

(limited to 'js/helper-classes/3D')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index d6334e6c..c7c1c08d 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -109,8 +109,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 			this._gridOrigin = [0,0];	// 2D plane space point
 
             this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
-            this.eventManager.addEventListener("deleteSelection", this, false);
+            this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("closeDocument", this, false);
 		}
@@ -147,38 +146,47 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     handleElementAdded: {
         value: function(event) {
-            this.addElement(event.detail);
+            var elements = event.detail;
+
+            if(Array.isArray(elements)) {
+                elements.forEach(function(element) {
+                    this.addElement(element);
+                }, this);
+            } else {
+                this.addElement(elements);
+            }
+
             this.drawWorkingPlane();
         }
     },
 
-    handleElementDeleted: {
+    handleElementsRemoved: {
         value: function(event) {
-            this.removeElement(event.detail);
-        }
-    },
+            var elements = event.detail;
+
+            if(Array.isArray(elements)) {
+                elements = Array.prototype.slice.call(elements, 0);
+                elements.forEach(function(element) {
+                    this.removeElement(element);
+                }, this);
+            } else {
+                this.removeElement(elements._element || elements);
+            }
 
-    handleDeleteSelection: {
-        value: function(event) {
             this.drawWorkingPlane();
         }
     },
 
     _shouldUpdatePlanes: {
         value: function(props) {
-            if(!props)
-            {
+            if(!props) {
                 return false;
-            }
-            else if (typeof props === "string")
-            {
+            } else if (typeof props === "string") {
                 return (this._updatePlaneProps.indexOf(props) !== -1);
             }
 
-            for (var p in props)
-            {
-                if(this._updatePlaneProps.indexOf(p) !== -1)
-                {
+            for (var p in props) {
+                if(this._updatePlaneProps.indexOf(p) !== -1) {
                     return true;
                 }
             }
@@ -199,15 +207,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             {
                 var len = els.length,
                     i = 0,
-                    item,
-                    el;
+                    item;
 
                 for(i=0; i < len; i++) {
-                    item = els[i];
-                    el = item._element || item;
-                    if(el.elementModel.props3D.elementPlane)
+                    if(els[i].elementModel.props3D.elementPlane)
                     {
-                        el.elementModel.props3D.elementPlane.init();
+                        els[i].elementModel.props3D.elementPlane.init();
                     }
                 }
 
@@ -222,17 +227,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 	// Methods
 	///////////////////////////////////////////////////////////////////////
 
-	addElement:
-	{
-		value: function( elt )
-		{
+	addElement: {
+		value: function( elt ) {
 			// check if we already know about this object
 			var n = this._eltArray.length;
-			for (var i=0;  i<n;  i++)
-			{
-				if (elt == this._eltArray[i])
-				{
-//					console.log( "element already added to stage display: " + elt.id );
+			for (var i=0;  i<n;  i++) {
+				if (elt == this._eltArray[i]) {
 					return;
 				}
 			}
@@ -248,17 +248,14 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 		}
 	},
 
-	removeElement : {
-		value: function( elt ) {
+    removeElement: {
+        value: function(element) {
 			// check if object exists
-			var n = this._eltArray.length;
-			for (var i=0;  i<n;  i++)
-			{
-				if (elt == this._eltArray[i])
-				{
+			var _elements = this._eltArray.length;
+			for (var i=0;  i < _elements;  i++) {
+				if (element === this._eltArray[i]) {
 					// First remove the planes for this element
 					this._planesArray.splice(i, 1);
-
 					// Then remove the element
 					this._eltArray.splice(i, 1);
 
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 5b467b41..67dedc49 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -123,7 +123,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 	///////////////////////////////////////////////////////////////////////
     initialize: {
         value: function() {
-            this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("elementsRemoved", this, false);
         }
     },
 
@@ -163,9 +163,19 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
     },
 
 
-    handleElementDeleted: {
+    handleElementsRemoved: {
         value: function(event) {
-            this.removeElementFrom2DCache(event.detail);
+            var self = this, elements = event.detail;
+
+            if(Array.isArray(elements)) {
+                elements = Array.prototype.slice.call(elements, 0);
+                elements.forEach(function(element) {
+                    element = element._element || element;
+                    self.removeElementFrom2DCache(element);
+                });
+            } else {
+                this.removeElementFrom2DCache(elements._element || elements);
+            }
         }
     },
 
-- 
cgit v1.2.3


From f699c3b4a0b39263bc1113882c66fbe616b2a271 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 4 Apr 2012 11:31:26 -0700
Subject: Need to set elementModel.isIn2DSnapCache flag to false when removing
 element from SnapManager's cache.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/snap-manager.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/helper-classes/3D')

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 67dedc49..9f6b9ed1 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -499,6 +499,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 				var n = this._elementCache.length;
 				this._elementCache[index] = this._elementCache[n-1];
 				this._elementCache.pop();
+                target.elementModel.isIn2DSnapCache = false;
 				found = true;
 			}
 
-- 
cgit v1.2.3