diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /js/tools/SelectionTool.js | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/tools/SelectionTool.js')
| -rw-r--r-- | js/tools/SelectionTool.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 5f2a959f..862b2e88 100644 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
| @@ -180,7 +180,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
| 180 | this._handleMode = null; | 180 | this._handleMode = null; |
| 181 | this._delta = null; | 181 | this._delta = null; |
| 182 | this.DrawHandles(); | 182 | this.DrawHandles(); |
| 183 | console.log( "move: (" + dx + ", " + dy + ")" ); | ||
| 184 | } | 183 | } |
| 185 | 184 | ||
| 186 | this.endDraw(event); | 185 | this.endDraw(event); |