diff options
| author | Ananya Sen | 2012-02-22 12:18:25 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-22 12:18:25 -0800 |
| commit | dbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch) | |
| tree | ace2a2415ef14662c27cdb2528914bef0a7f9208 /js/tools/modifier-tool-base.js | |
| parent | 9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff) | |
| parent | 27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff) | |
| download | ninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/modifier-tool-base.js')
| -rwxr-xr-x | js/tools/modifier-tool-base.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 67b217c4..54bc06be 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
| @@ -791,8 +791,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
| 791 | HandleLeftButtonDown: { | 791 | HandleLeftButtonDown: { |
| 792 | value: function(event) { | 792 | value: function(event) { |
| 793 | 793 | ||
| 794 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, | 794 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); |
| 795 | new WebKitPoint(event.pageX, event.pageY)); | ||
| 796 | this.downPoint.x = point.x; | 795 | this.downPoint.x = point.x; |
| 797 | this.downPoint.y = point.y; | 796 | this.downPoint.y = point.y; |
| 798 | 797 | ||