Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/lib/drawing/world.js

2 files changed, 10 insertions, 13 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 6be2df1d..ae9260fc 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -53,12 +53,8 @@ exports.Layout = Montage.create(Component, {
             this.ctx.lineWidth = this.ctxLineWidth;
             this.ctx.fillStyle = this.drawFillColor;
 
-//            this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
-
             this.eventManager.addEventListener("selectionChange", this, false);
-
-            this.eventManager.addEventListener("deleteSelection", this, false);
+            this.eventManager.addEventListener("elementsRemoved", this, false);
         }
     },
 
@@ -76,7 +72,7 @@ exports.Layout = Montage.create(Component, {
     },
 
     // Redraw stage only once after all deletion is completed
-    handleDeleteSelection: {
+    handleElementsRemoved: {
         value: function(event) {
             this.draw();
             this.draw3DInfo(false);
@@ -110,10 +106,8 @@ exports.Layout = Montage.create(Component, {
 
             // Draw the non selected elements
             if(!event.detail.isDocument) {
-                var tmp = event.detail.elements.map(function(element){ return element._element});
-
                 this.elementsToDraw = this.domTree.filter(function(value) {
-                    return (tmp.indexOf(value) === -1);
+                    return (event.detail.elements.indexOf(value) === -1);
                 });
             } else {
                 this.elementsToDraw = Array.prototype.slice.call(this.domTree, 0);
@@ -345,7 +339,11 @@ exports.Layout = Montage.create(Component, {
 
     _elementName: {
         value: function(item) {
-            return this.application.ninja.elementMediator.getNJProperty(item, "selection");
+            if(item.elementModel && item.elementModel.hasOwnProperty("selection")) {
+                return item.elementModel['selection'];
+            } else {
+                return "";
+            }
         }
     }
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 00b72490..3500b6a3 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -560,8 +560,7 @@ exports.Stage = Montage.create(Component, {
                 elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop);
 
             // workaround Chrome 3d bug
-            if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1)
-            {
+            if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) {
                 return this._getElementUsingSnapping(point);
             } else {
                 return elt;
@@ -605,7 +604,7 @@ exports.Stage = Montage.create(Component, {
                 var selArray = new Array();
 
                 for(var i = 0; this.application.ninja.selectedElements[i];i++) {
-                    var curElement = this.application.ninja.selectedElements[i]._element;
+                    var curElement = this.application.ninja.selectedElements[i];
 
                     // Add element to array that is used to calculate 3d-bounding box of all elements
                     selArray.push( curElement );