Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

1 files changed, 44 insertions, 3 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index fd96af4d..c07391db 100644
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -71,6 +71,9 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
         _selectionCtr : {value: null, writable: true },
 
+    // Properties that require element planes to be updated
+        _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
+
         ///////////////////////////////////////////////////////////////////////
         // Property accessors
         ///////////////////////////////////////////////////////////////////////
@@ -107,6 +110,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("deleteSelection", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
                 }
         },
@@ -124,11 +128,44 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
+    handleDeleteSelection: {
+        value: function(event) {
+            this.drawWorkingPlane();
+        }
+    },
+
+    _shouldUpdatePlanes: {
+        value: function(props) {
+            if(!props)
+            {
+                return false;
+            }
+            else if (typeof props === "string")
+            {
+                return (this._updatePlaneProps.indexOf(props) !== -1);
+            }
+
+            for (var p in props)
+            {
+                if(this._updatePlaneProps.indexOf(p) !== -1)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    },
 
+    // TODO - Check why handleElementChange is being fired before handleAddElement
     handleElementChange: {
         value: function(event) {
+            if(!event.detail || !event.detail.data)
+            {
+                return;
+            }
             var els = event.detail.data.els;
-            if(els)
+            if(els && this._shouldUpdatePlanes(event.detail.data.prop))
             {
                 var len = els.length,
                     i = 0,
@@ -138,10 +175,15 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 for(i=0; i < len; i++) {
                     item = els[i];
                     el = item._element || item;
-                    el.elementModel.props3D.elementPlane.init();
+                    if(el.elementModel.props3D.elementPlane)
+                    {
+                        el.elementModel.props3D.elementPlane.init();
+                    }
                 }
 
+                this.application.ninja.stage.layout.draw();
                 this.drawWorkingPlane();
+                this.draw3DCompass();
             }
         }
     },
@@ -1065,7 +1107,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         var tmpCanvas = this.application.ninja.stage.canvas;
                         var tmpStage = this.application.ninja.currentDocument.documentRoot;
                         this.viewUtils.pushViewportObj( tmpCanvas );
-                        var tmpStage = this.application.ninja.currentDocument.documentRoot;
 
                         // save the source space object and set to the target object
                         var saveSource = this._sourceSpaceElt;