Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 41 insertions, 22 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 3e0b852e..9e2df5a2 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -175,7 +175,7 @@ exports.Stage = Montage.create(Component, {
             }
             else if(this.updatedStage) {
                 this.layout.draw();
-                this.layout.draw3DInfo();
+                this.layout.draw3DInfo(true);
             }
         }
     },
@@ -787,14 +787,9 @@ exports.Stage = Montage.create(Component, {
                 var userContent = this.application.ninja.currentDocument.documentRoot;
                 if (userContent)
                 {
-                    var w = userContent.offsetWidth,
-                        h = userContent.offsetHeight;
-                    if(userContent.width)
-                        w = userContent.width;
-                    if(userContent.height)
-                        h = userContent.height;
-                    var localPt = [ w/2,  h/2, 0];
-                    var globalPt = this.stageDeps.viewUtils.localToGlobal( localPt, userContent );
+                    var w = this._canvas.width,
+                        h = this._canvas.height;
+                                        var globalPt = [w/2, h/2, 0];
 
                     this.stageDeps.viewUtils.setStageZoom( globalPt,  value/100 );
 
@@ -811,42 +806,66 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+        getPlaneForView:
+        {
+                value: function( side )
+                {
+                        var plane = [0,0,1,0];
+            switch(side)
+                        {
+                case "top":
+                                        plane = [0,1,0,0];
+                                        plane[3] = this.application.ninja.currentDocument.documentRoot.offsetHeight / 2.0;
+                   break;
+
+                case "side":
+                                        plane = [1,0,0,0];
+                                        plane[3] = this.application.ninja.currentDocument.documentRoot.offsetWidth / 2.0;
+                   break;
+
+                case "front":
+                    plane = [0,0,1,0];
+                    break;
+
+                                default:
+                                        console.log( "unrecognized view in snapManager.getPlaneForView: " + side );
+                                        break;
+            }
+
+                        return plane;
+                }
+        },
+
     setStageView: {
         value: function(side) {
             var mat,
-                workingPlane = null,
-                currentDoc = this.application.ninja.currentDocument.documentRoot;
+                currentDoc = this.application.ninja.currentDocument.documentRoot,
+                isDrawingGrid = this.application.ninja.appModel.show3dGrid;
             // Stage 3d Props.
             currentDoc.elementModel.props3D.ResetTranslationValues();
             currentDoc.elementModel.props3D.ResetRotationValues();
 
 
-            switch(side) {
+            switch(side){
                 case "top":
                     mat = Matrix.RotationX(Math.PI * 270.0/180.0);
-
                     drawUtils.drawXY = drawUtils.drawYZ = false;
-                    drawUtils.drawXZ = drawUtils.isDrawingGrid();
-                    workingPlane = [0,1,0,0];
+                    drawUtils.drawXZ = isDrawingGrid;
                     break;
 
                 case "side":
                     mat = Matrix.RotationY(Math.PI * 270/180);
-
                     drawUtils.drawXY = drawUtils.drawXZ = false;
-                    drawUtils.drawYZ = drawUtils.isDrawingGrid();
-                    workingPlane = [1,0,0,0];
+                    drawUtils.drawYZ = isDrawingGrid;
                     break;
 
                 case "front":
                     mat = Matrix.I(4);
-
                     drawUtils.drawYZ = drawUtils.drawXZ = false;
-                    drawUtils.drawXY = drawUtils.isDrawingGrid();
-                    workingPlane = [0,0,1,0];
+                    drawUtils.drawXY = isDrawingGrid;
                     break;
             }
-
+                        workingPlane = this.getPlaneForView( side );
 
             this.stageDeps.viewUtils.setMatrixForElement(currentDoc, mat, false);