Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into binding

2 files changed, 9 insertions, 8 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index f869f65e..b53ac4ad 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1170,8 +1170,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         var saveColor = this._lineColor;
                         var saveLineWidth = this._lineWidth;
 
-                        var origLeft = 50;
-                        var origTop = 50;
+                        var origLeft = 60;
+                        var origTop = this.snapManager.getStageHeight() - 60;
 
                         var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
                         var tMat = Matrix.Translation([origLeft,origTop,0]);
@@ -1203,7 +1203,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas);
                         // clear just the 3d compass area
                         this._drawingContext.save();
-                        this._drawingContext.rect(0, 0, 100, 100);
+                        this._drawingContext.rect(10, origTop-60, 100, 110);
                         this._drawingContext.clip();
 
                         this._drawingContext.lineWidth = 2.0;
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 5dc099ee..8c338f84 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -354,16 +354,17 @@ exports.ViewUtils = Montage.create(Component, {
 
             // transform the bounds up the tree
             var child = elt;
-            var parent = elt.offsetParent;
             while ( child )
             {
                 pt = this.childToParent( pt, child );
 
-//                if (parent === this._rootElement)  break;
-                if (child === this._stageElement)  break;
+//                if (child === this._stageElement)  break;
+//                child = child.offsetParent;
 
-                child = parent;
-                parent = parent.offsetParent;
+                if (child === this._stageElement)  break;
+                if (child === this._rootElement)  break;
+                child = child.offsetParent;
+                if (child === this._rootElement)  break;
             }
 
             /////////////////////////////////////////////////////////