diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/tools/ToolBase.js | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/tools/ToolBase.js')
| -rwxr-xr-x | js/tools/ToolBase.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js index 69ac5727..f43b1b58 100755 --- a/js/tools/ToolBase.js +++ b/js/tools/ToolBase.js | |||
| @@ -89,9 +89,9 @@ exports.toolBase = Montage.create(Component, { | |||
| 89 | 89 | ||
| 90 | if(this._canOperateOnStage) { | 90 | if(this._canOperateOnStage) { |
| 91 | if(event.shiftKey) { | 91 | if(event.shiftKey) { |
| 92 | this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.GetElement(event)); | 92 | this.application.ninja.selectionController.shiftSelectElement(this.application.ninja.stage.getElement(event)); |
| 93 | } else { | 93 | } else { |
| 94 | this.application.ninja.selectionController.selectElement(this.application.ninja.stage.GetElement(event)); | 94 | this.application.ninja.selectionController.selectElement(this.application.ninja.stage.getElement(event)); |
| 95 | } | 95 | } |
| 96 | } | 96 | } |
| 97 | 97 | ||