aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-01 09:29:49 -0700
committerNivesh Rajbhandari2012-05-01 09:29:49 -0700
commit84eec0ae4352c9f6e5986529cc70eed726d97a88 (patch)
tree4b9a319286549f85d92bdb580d56318187dfd92b
parent286836b141f14e45d74e70ee00ba129480d2fe7f (diff)
downloadninja-84eec0ae4352c9f6e5986529cc70eed726d97a88.tar.gz
webTemplate var gets reset to false, so must check for new stage template differently.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js3
-rwxr-xr-xjs/tools/RotateStage3DTool.js6
2 files changed, 6 insertions, 3 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index f7b02485..81a740e0 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -588,7 +588,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
588 height, 588 height,
589 nLines = 10; 589 nLines = 10;
590 590
591 if(this.application.ninja.documentController.webTemplate) { 591// if(this.application.ninja.documentController.webTemplate) {
592 if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
592 width = this.application.ninja.currentDocument.documentRoot.scrollWidth; 593 width = this.application.ninja.currentDocument.documentRoot.scrollWidth;
593 height = this.application.ninja.currentDocument.documentRoot.scrollHeight; 594 height = this.application.ninja.currentDocument.documentRoot.scrollHeight;
594 } else { 595 } else {
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 0210289f..2a9c63db 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -96,7 +96,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
96 viewUtils.pushViewportObj( stage ); 96 viewUtils.pushViewportObj( stage );
97 var eltCtr = viewUtils.getCenterOfProjection(); 97 var eltCtr = viewUtils.getCenterOfProjection();
98 viewUtils.popViewportObj(); 98 viewUtils.popViewportObj();
99 if(this.application.ninja.documentController.webTemplate) 99// if(this.application.ninja.documentController.webTemplate)
100 if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
100 { 101 {
101 eltCtr[0] = stage.scrollWidth/2; 102 eltCtr[0] = stage.scrollWidth/2;
102 eltCtr[1] = stage.scrollHeight/2; 103 eltCtr[1] = stage.scrollHeight/2;
@@ -118,7 +119,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
118 119
119 this._origin = viewUtils.localToGlobal(eltCtr, stage); 120 this._origin = viewUtils.localToGlobal(eltCtr, stage);
120 121
121 if(this.application.ninja.documentController.webTemplate) 122// if(this.application.ninja.documentController.webTemplate)
123 if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
122 { 124 {
123 this._startOriginArray = []; 125 this._startOriginArray = [];
124 this._startOriginArray.push(this._origin.slice()); 126 this._startOriginArray.push(this._origin.slice());