Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 2de67538..a096848e 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 "";
+            }
         }
     }