aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-11 14:42:15 -0700
committerJose Antonio Marquez2012-05-11 14:42:15 -0700
commitd2e1d4eeba4439ed26f2adf1c34991caf44a591f (patch)
tree7ccb54a07eb4adf793bae3f1a4ddd622bd4f9a0c
parentc87e538fdc337639bc4d54bb087dbf2b4f20297f (diff)
parent647a7cf0697debe7b3d6fa0d68cd6b37996d6b59 (diff)
downloadninja-d2e1d4eeba4439ed26f2adf1c34991caf44a591f.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js6
-rwxr-xr-xjs/helper-classes/3D/view-utils.js5
2 files changed, 4 insertions, 7 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index f639521c..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, {
1170 var saveColor = this._lineColor; 1170 var saveColor = this._lineColor;
1171 var saveLineWidth = this._lineWidth; 1171 var saveLineWidth = this._lineWidth;
1172 1172
1173 var origLeft = 50; 1173 var origLeft = 60;
1174 var origTop = this.snapManager.getStageHeight() - 50; 1174 var origTop = this.snapManager.getStageHeight() - 60;
1175 1175
1176 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); 1176 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
1177 var tMat = Matrix.Translation([origLeft,origTop,0]); 1177 var tMat = Matrix.Translation([origLeft,origTop,0]);
@@ -1203,7 +1203,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1203 this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas); 1203 this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas);
1204 // clear just the 3d compass area 1204 // clear just the 3d compass area
1205 this._drawingContext.save(); 1205 this._drawingContext.save();
1206 this._drawingContext.rect(0, origTop-50, 100, 100); 1206 this._drawingContext.rect(10, origTop-60, 100, 110);
1207 this._drawingContext.clip(); 1207 this._drawingContext.clip();
1208 1208
1209 this._drawingContext.lineWidth = 2.0; 1209 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..22446403 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -354,16 +354,13 @@ exports.ViewUtils = Montage.create(Component, {
354 354
355 // transform the bounds up the tree 355 // transform the bounds up the tree
356 var child = elt; 356 var child = elt;
357 var parent = elt.offsetParent;
358 while ( child ) 357 while ( child )
359 { 358 {
360 pt = this.childToParent( pt, child ); 359 pt = this.childToParent( pt, child );
361 360
362// if (parent === this._rootElement) break;
363 if (child === this._stageElement) break; 361 if (child === this._stageElement) break;
364 362
365 child = parent; 363 child = child.offsetParent;
366 parent = parent.offsetParent;
367 } 364 }
368 365
369 ///////////////////////////////////////////////////////// 366 /////////////////////////////////////////////////////////