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

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 10 insertions, 2 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 7fc492a5..f4bfc12b 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1617,7 +1617,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         if (x > y) {
                                                 if (x > z) {
                                                         plane[0] = 1;
-                                                        plane[3] = this.getStageWidth() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollWidth / 2.0;
+                            } else {
+                                plane[3] = this.getStageWidth() / 2.0;
+                            }
                                                         if (dir[0] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawYZ;
                                                         drawUtils.drawXY = drawUtils.drawXZ = false;
@@ -1635,7 +1639,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         else {
                                                 if (y > z) {
                                                         plane[1] = 1;
-                                                        plane[3] = this.getStageHeight() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollHeight / 2.0;
+                            } else {
+                                plane[3] = this.getStageHeight() / 2.0;
+                            }
                                                         if (dir[1] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawXZ;
                                                         drawUtils.drawXY = drawUtils.drawYZ = false;