Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

2 files changed, 17 insertions, 2 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index ec8c0e55..8382135d 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -252,7 +252,9 @@ exports.Stage = Montage.create(Component, {
             this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
             this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop;
 
-            this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
+            // Hardcode this value so that it does not fail for the new stage architecture
+            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
+            this.userContentBorder = 1; //parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
 
             this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
             this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
diff --git a/js/stage/tool-handle.js b/js/stage/tool-handle.js
index d353da47..63cf30e5 100755
--- a/js/stage/tool-handle.js
+++ b/js/stage/tool-handle.js
@@ -585,7 +585,20 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
             this._origin = pointOnElt;
 
 
-            var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+            var stage = this.application.ninja.currentDocument.documentRoot;
+            var viewMat = viewUtils.getMatrixFromElement(stage);
+            // Get viewMat without zoom value
+            var zoom = this.application.ninja.documentBar.zoomFactor/100;
+            if(zoom !== 1)
+            {
+                var zoomMatInv = Matrix.create( [
+                       [ 1/zoom,    0,    0, 0],
+                       [    0, 1/zoom,    0, 0],
+                       [    0,    0, 1/zoom, 0],
+                       [    0,    0,      0, 1]
+                   ] );
+                glmat4.multiply( zoomMatInv, viewMat, viewMat );
+            }
 
             var transMat = viewMat.slice(0);
             if(inLocalMode)