diff options
| author | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
| commit | 1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d (patch) | |
| tree | febe5a23c3667523e90de031987a11764f417da7 /js/tools/modifier-tool-base.js | |
| parent | b1daf0b285a4a96bfd0086709c20e3682d75551a (diff) | |
| parent | f9d34a54baf61ccdf77732b1aaedb29d296b8c2e (diff) | |
| download | ninja-1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d.tar.gz | |
Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Valerio Virgillito <valerio@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 | ||