diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/tools/modifier-tool-base.js | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x[-rw-r--r--] | js/tools/modifier-tool-base.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 67b217c4..7d946cb0 100644..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 | ||
@@ -867,8 +866,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
867 | { | 866 | { |
868 | this._handleMode = null; | 867 | this._handleMode = null; |
869 | this._delta = null; | 868 | this._delta = null; |
870 | this.DrawHandles(); | ||
871 | } | 869 | } |
870 | this.DrawHandles(); | ||
872 | } | 871 | } |
873 | }, | 872 | }, |
874 | 873 | ||