diff options
author | Ananya Sen | 2012-06-20 15:20:04 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-20 15:20:04 -0700 |
commit | caa9683fd259307658f96190a5c5bd771126fbb8 (patch) | |
tree | 83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/tools/SelectionTool.js | |
parent | d852ea28dad399e84e8d5e69c0293500c30b59f1 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-x | js/tools/SelectionTool.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 8b644d4a..9bd885a4 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -583,11 +583,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
583 | this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec); | 583 | this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec); |
584 | if (this._mouseDownHitRec && this._mouseUpHitRec) | 584 | if (this._mouseDownHitRec && this._mouseUpHitRec) |
585 | { | 585 | { |
586 | data = this.getDrawingData(event); | 586 | this.modifyElements({pt0:this._mouseDownHitRec.calculateElementScreenPoint(), |
587 | if(data) | 587 | pt1:this._mouseUpHitRec.calculateElementScreenPoint()}, event); |
588 | { | ||
589 | this.modifyElements({pt0:data.mouseDownPos, pt1:data.mouseUpPos}, event); | ||
590 | } | ||
591 | } | 588 | } |
592 | } | 589 | } |
593 | } | 590 | } |