webTemplate var gets reset to false, so must check for new stage template differently.

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

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, {
                 height,
                 nLines = 10;
 
-            if(this.application.ninja.documentController.webTemplate) {
+//            if(this.application.ninja.documentController.webTemplate) {
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
                 width = this.application.ninja.currentDocument.documentRoot.scrollWidth;
                 height = this.application.ninja.currentDocument.documentRoot.scrollHeight;
             } 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, {
             viewUtils.pushViewportObj( stage );
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
-            if(this.application.ninja.documentController.webTemplate)
+//            if(this.application.ninja.documentController.webTemplate)
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
             {
                 eltCtr[0] = stage.scrollWidth/2;
                 eltCtr[1] = stage.scrollHeight/2;
@@ -118,7 +119,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
 
-            if(this.application.ninja.documentController.webTemplate)
+//            if(this.application.ninja.documentController.webTemplate)
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
             {
                 this._startOriginArray = [];
                 this._startOriginArray.push(this._origin.slice());