diff options
| author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
| commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
| tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/tools/Rotate3DToolBase.js | |
| parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
| -rw-r--r-- | js/tools/Rotate3DToolBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js index 6e17864b..aa91b2f4 100644 --- a/js/tools/Rotate3DToolBase.js +++ b/js/tools/Rotate3DToolBase.js | |||
| @@ -254,7 +254,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
| 254 | captureSelectionDrawn: { | 254 | captureSelectionDrawn: { |
| 255 | value: function(event){ | 255 | value: function(event){ |
| 256 | this._origin = null; | 256 | this._origin = null; |
| 257 | this._targets = null; | 257 | this._targets = []; |
| 258 | this._startOriginArray = null; | 258 | this._startOriginArray = null; |
| 259 | 259 | ||
| 260 | var len = this.application.ninja.selectedElements.length; | 260 | var len = this.application.ninja.selectedElements.length; |