aboutsummaryrefslogtreecommitdiff
path: root/js/tools/drawing-tool-base.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-04 10:43:29 -0700
committerAnanya Sen2012-06-04 10:43:29 -0700
commit6fb29883329c9c42a8b406128b92c0e6323a47be (patch)
tree07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/tools/drawing-tool-base.js
parentcf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-xjs/tools/drawing-tool-base.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 3549de1c..a752ad65 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -86,7 +86,7 @@ exports.DrawingToolBase = Montage.create(Component, {
86// return null; 86// return null;
87// } 87// }
88 if(downHitRec) { 88 if(downHitRec) {
89 hitRec = hitRec.convertToWorkingPlane(this.dragPlane); 89 hitRec = hitRec.convertToWorkingPlane(this.dragPlane || downHitRec.getPlane());
90 } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) { 90 } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
91 hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() ); 91 hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
92 } 92 }