diff options
| author | Jose Antonio Marquez | 2012-02-27 14:29:53 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-27 14:29:53 -0800 |
| commit | ceba159acedcaada47f990392b3bbebc2025e40a (patch) | |
| tree | 9e7f9b00ac5b25eec744ce1ff9d407e4317569ab /js/mediators | |
| parent | a564d969ffcb7bc0dd701a1ef653f666ae857f77 (diff) | |
| parent | 3e2889b94d5e6af93ec0eaca114802e30c8c38ef (diff) | |
| download | ninja-ceba159acedcaada47f990392b3bbebc2025e40a.tar.gz | |
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js/mediators')
| -rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 443a18ac..62b514ee 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
| @@ -170,7 +170,7 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | // Zoom tool | 172 | // Zoom tool |
| 173 | if(evt.keyCode === Keyboard.Z ) { | 173 | if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z |
| 174 | evt.preventDefault(); | 174 | evt.preventDefault(); |
| 175 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); | 175 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); |
| 176 | return; | 176 | return; |