diff options
author | Jon Reid | 2012-05-04 14:56:24 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-04 14:56:24 -0700 |
commit | a6dd2917edcfeca1be7553e03281ddd538422ae1 (patch) | |
tree | e6846626bf1e967e80bcd652f6a76bb97abb1789 /js/helper-classes/3D/snap-manager.js | |
parent | 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff) | |
parent | 8964e070fa760d23c2de272ca36b8d9beba6007d (diff) | |
download | ninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 12 |
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, { | |||
1617 | if (x > y) { | 1617 | if (x > y) { |
1618 | if (x > z) { | 1618 | if (x > z) { |
1619 | plane[0] = 1; | 1619 | plane[0] = 1; |
1620 | plane[3] = this.getStageWidth() / 2.0; | 1620 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") { |
1621 | plane[3] = stage.scrollWidth / 2.0; | ||
1622 | } else { | ||
1623 | plane[3] = this.getStageWidth() / 2.0; | ||
1624 | } | ||
1621 | if (dir[0] > 0) plane[3] = -plane[3]; | 1625 | if (dir[0] > 0) plane[3] = -plane[3]; |
1622 | change = !drawUtils.drawYZ; | 1626 | change = !drawUtils.drawYZ; |
1623 | drawUtils.drawXY = drawUtils.drawXZ = false; | 1627 | drawUtils.drawXY = drawUtils.drawXZ = false; |
@@ -1635,7 +1639,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1635 | else { | 1639 | else { |
1636 | if (y > z) { | 1640 | if (y > z) { |
1637 | plane[1] = 1; | 1641 | plane[1] = 1; |
1638 | plane[3] = this.getStageHeight() / 2.0; | 1642 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") { |
1643 | plane[3] = stage.scrollHeight / 2.0; | ||
1644 | } else { | ||
1645 | plane[3] = this.getStageHeight() / 2.0; | ||
1646 | } | ||
1639 | if (dir[1] > 0) plane[3] = -plane[3]; | 1647 | if (dir[1] > 0) plane[3] = -plane[3]; |
1640 | change = !drawUtils.drawXZ; | 1648 | change = !drawUtils.drawXZ; |
1641 | drawUtils.drawXY = drawUtils.drawYZ = false; | 1649 | drawUtils.drawXY = drawUtils.drawYZ = false; |