Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

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, {
                 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleEscape(evt);
                 //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar");
             }
+            
+            // Check if cmd+a/ctrl+a for Select All
+            if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) {
+                this.application.ninja.executeChromePreview();
+                return;
+            }
 
             if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyPress(evt);