aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage-deps.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-06 07:54:11 -0700
committerPushkar Joshi2012-06-06 07:54:11 -0700
commitcfa1402ac2ce831a83a9d4263d06c452c157a414 (patch)
treeadb8f1f1ad1c4dd1e7e9eee1bd206f1ec338d20c /js/stage/stage-deps.js
parent8606ee7ec851cb0a971e7556eba5d9386f1b3639 (diff)
parent5ba54dc275b07e7b2d0ed14751761d1e663d3d14 (diff)
downloadninja-cfa1402ac2ce831a83a9d4263d06c452c157a414.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/stage/stage-deps.js')
-rwxr-xr-xjs/stage/stage-deps.js27
1 files changed, 2 insertions, 25 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 896d4a5b..762c2529 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -14,6 +14,7 @@ var Montage = require("montage/core/core").Montage,
14 VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; 14 VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
15 15
16exports.StageDeps = Montage.create(Component, { 16exports.StageDeps = Montage.create(Component, {
17
17 viewUtils: { 18 viewUtils: {
18 value: viewUtils 19 value: viewUtils
19 }, 20 },
@@ -37,8 +38,6 @@ exports.StageDeps = Montage.create(Component, {
37 window.MathUtils = MathUtilsClass; 38 window.MathUtils = MathUtilsClass;
38 window.VecUtils = VecUtils; 39 window.VecUtils = VecUtils;
39 40
40 snapManager.drawingCanvas = this.stage.drawingCanvas;
41
42 // Setup the listeners for the draw-util and snapmanager when removing elements 41 // Setup the listeners for the draw-util and snapmanager when removing elements
43 // TODO Revisit when supporting multiple documents 42 // TODO Revisit when supporting multiple documents
44 drawUtils.initialize(); 43 drawUtils.initialize();
@@ -57,28 +56,6 @@ exports.StageDeps = Montage.create(Component, {
57 drawUtils.snapManager = snapManager; 56 drawUtils.snapManager = snapManager;
58 drawUtils.ElementPlanes = ElementPlanes; 57 drawUtils.ElementPlanes = ElementPlanes;
59 } 58 }
60 },
61
62 handleOpenDocument: {
63 value: function() {
64
65 workingPlane = [0,0,1,0];
66
67 snapManager._isCacheInvalid = true;
68 snapManager.setupDragPlaneFromPlane (workingPlane);
69
70 drawUtils.initializeFromDocument();
71 }
72 },
73
74 handleSwitchDocument: {
75 value: function(){
76 workingPlane = [0,0,1,0];
77
78 snapManager._isCacheInvalid = true;
79 snapManager.setupDragPlaneFromPlane (workingPlane);
80
81 drawUtils.initializeFromDocument();
82 }
83 } 59 }
60
84}); \ No newline at end of file 61}); \ No newline at end of file