aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorAnanya Sen2012-02-18 18:49:45 -0800
committerAnanya Sen2012-02-18 18:49:45 -0800
commit8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch)
tree4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/mediators
parentc2a5918480adae0124e1dc2531c019562f1e3e60 (diff)
parente23708721a71ca4c71365f5f8e8ac7d6113926db (diff)
downloadninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 4011db69..40b26582 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -209,6 +209,12 @@ exports.KeyboardMediator = Montage.create(Component, {
209 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleEscape(evt); 209 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleEscape(evt);
210 //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar"); 210 //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar");
211 } 211 }
212
213 // Check if cmd+a/ctrl+a for Select All
214 if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) {
215 this.application.ninja.executeChromePreview();
216 return;
217 }
212 218
213 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyPress(evt); 219 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyPress(evt);
214 220