diff options
author | Valerio Virgillito | 2012-05-04 18:10:52 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-04 18:10:52 -0700 |
commit | 30e837ade2da7cb20caf7c5a69faf0888736bb9a (patch) | |
tree | 3155deaea5616fa09fc96c84567419fec5f288a2 /js/helper-classes/3D/snap-manager.js | |
parent | 3ebed34665fa73b0ce613b400f3029ebf4476439 (diff) | |
parent | 1b2af54128985c1b622e13ea740a8402e57527cc (diff) | |
download | ninja-30e837ade2da7cb20caf7c5a69faf0888736bb9a.tar.gz |
Merge pull request #195 from mqg734/Dom-Architecture
Fixes for 3d, selection, and keyboard shortcuts
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index f4bfc12b..31e3e540 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1617,11 +1617,7 @@ 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 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") { | 1620 | plane[3] = this.getStageWidth() / 2.0; |
1621 | plane[3] = stage.scrollWidth / 2.0; | ||
1622 | } else { | ||
1623 | plane[3] = this.getStageWidth() / 2.0; | ||
1624 | } | ||
1625 | if (dir[0] > 0) plane[3] = -plane[3]; | 1621 | if (dir[0] > 0) plane[3] = -plane[3]; |
1626 | change = !drawUtils.drawYZ; | 1622 | change = !drawUtils.drawYZ; |
1627 | drawUtils.drawXY = drawUtils.drawXZ = false; | 1623 | drawUtils.drawXY = drawUtils.drawXZ = false; |
@@ -1639,11 +1635,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1639 | else { | 1635 | else { |
1640 | if (y > z) { | 1636 | if (y > z) { |
1641 | plane[1] = 1; | 1637 | plane[1] = 1; |
1642 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") { | 1638 | plane[3] = this.getStageHeight() / 2.0; |
1643 | plane[3] = stage.scrollHeight / 2.0; | ||
1644 | } else { | ||
1645 | plane[3] = this.getStageHeight() / 2.0; | ||
1646 | } | ||
1647 | if (dir[1] > 0) plane[3] = -plane[3]; | 1639 | if (dir[1] > 0) plane[3] = -plane[3]; |
1648 | change = !drawUtils.drawXZ; | 1640 | change = !drawUtils.drawXZ; |
1649 | drawUtils.drawXY = drawUtils.drawYZ = false; | 1641 | drawUtils.drawXY = drawUtils.drawYZ = false; |