4 files changed, 148 insertions, 115 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index c31ffbac..3cd2c254 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -100,18 +100,26 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
-            pickerSettings.callback = this.openFileWithURI.bind(this);
-            pickerSettings.pickerMode = "read";
-            pickerSettings.inFileMode = true;
-            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            //adding callback so that file picker can be opened after checking cloud status
+            this.application.ninja.coreIoApi.cloudAvailable(function(){
+                pickerSettings.callback = this.openFileWithURI.bind(this);
+                pickerSettings.pickerMode = "read";
+                pickerSettings.inFileMode = true;
+                this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            }.bind(this));
+
         }
     },
 
     handleExecuteNewFile: {
             value: function(event) {
                 var newFileSettings = event._event.settings || {};
-                newFileSettings.callback = this.createNewFile.bind(this);
-                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                //adding callback so that new file dialog can be opened after checking cloud status
+                this.application.ninja.coreIoApi.cloudAvailable(function(){
+                    newFileSettings.callback = this.createNewFile.bind(this);
+                    this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                }.bind(this));
+
             }
     },
         
@@ -305,6 +313,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 this._removeDocumentView(doc.container);
                 this.application.ninja.stage.stageView.hideRulers();
                 document.getElementById("iframeContainer").style.display="block";
+
+                this.application.ninja.stage.hideCanvas(true);
             }
         }
     },
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 2051da43..1bc66532 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -234,18 +234,19 @@ exports.CoreIoApi = Montage.create(Component, {
     //Method to check status of I/O API, will return false if not active
         cloudAvailable: {
                 enumerable: false,
-                value: function () {
+                value: function (callback) {
                         var cloud = this.getCloudStatus();
                         //
                         if (this.rootUrl && cloud.status === 200) {
                                 //Active
                                 this.cloudData.name = cloud.response['name'];
                                 this.cloudData.root = cloud.response['server-root'];
-                                return true;
+                if(!!callback){callback();}
+                                else{return true};
                         } else {
                                 //Inactive
                                 if (!this._cloudDialogOpen && this.application.ninja) {
-                                        this.showCloudDialog();
+                                        this.showCloudDialog(callback);
                                 }
                                 return false;
                         }
@@ -273,7 +274,7 @@ exports.CoreIoApi = Montage.create(Component, {
     //
     showCloudDialog: {
         enumerable: false,
-                value: function () {
+                value: function (callback) {
                         //
                         this._cloudDialogOpen = true;
                         //
@@ -294,6 +295,7 @@ exports.CoreIoApi = Montage.create(Component, {
                 this._cloudDialogComponents.dialog.element = popup;
                 this._cloudDialogComponents.dialog.needsDraw = true;
                 this._cloudDialogComponents.dialog.element.style.opacity = 0;
+            this._cloudDialogComponents.dialog.callback = callback;
                 //
                 this._cloudDialogComponents.dialog.addEventListener('firstDraw', this, false);
                 }
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index d2e82662..34393db5 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -23,6 +23,12 @@ exports.CloudPopup = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    callback:{
+        writable:true,
+        enumerable:true,
+        value:null
+    },
+    //
     components: {
         enumerable: false,
         value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null}
@@ -125,6 +131,10 @@ exports.CloudPopup = Montage.create(Component, {
         value: function() {
                 //
                 this.application.ninja.coreIoApi.hideCloudDialog();
+            this.application.ninja.coreIoApi._cloudDialogOpen=false;
+            if(!!this.callback){
+                this.callback();
+            }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -135,6 +145,7 @@ exports.CloudPopup = Montage.create(Component, {
                 //
                 this.application.ninja.coreIoApi.rootUrl = null;
                 this.application.ninja.coreIoApi.hideCloudDialog();
+            this.application.ninja.coreIoApi._cloudDialogOpen=false;
         }
     }
     ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 40b26582..0282060f 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -85,23 +85,115 @@ exports.KeyboardMediator = Montage.create(Component, {
 
     handleKeydown: {
         value: function(evt) {
-            if((document.activeElement.nodeName !== "BODY") && (!!this.application.ninja.documentController.activeDocument)
-                && (this.application.ninja.documentController.activeDocument.currentView === "design")) {
-                // Don't do anything if an input or other control is focused
-                return;
-            }
 
-            // Disable defaults for the Arrow Keys
-            if((evt.keyCode == Keyboard.LEFT) || (evt.keyCode == Keyboard.RIGHT) || (evt.keyCode == Keyboard.UP) || (evt.keyCode == Keyboard.DOWN)) {
-                evt.preventDefault();
-            }
+            //keyboard controls for html design view
+            if((!!this.application.ninja.documentController.activeDocument) && (this.application.ninja.documentController.activeDocument.currentView === "design")){
+
+                // Don't do anything if an input or other control is focused
+                if(document.activeElement.nodeName !== "BODY") {
+                    return;
+                }
+
+                // Disable defaults for the Arrow Keys
+                if((evt.keyCode == Keyboard.LEFT) || (evt.keyCode == Keyboard.RIGHT) || (evt.keyCode == Keyboard.UP) || (evt.keyCode == Keyboard.DOWN)) {
+                    evt.preventDefault();
+                }
+
+                // Check DELETE OR BACKSPACE
+                if((evt.keyCode == Keyboard.BACKSPACE) || (evt.keyCode == Keyboard.DELETE)) {
+                    evt.stopImmediatePropagation();
+                    evt.preventDefault();
+                    NJevent("deleting");
+                    return;
+                }
+
+
+                // Shortcut for Selection Tool is V
+                if(evt.keyCode === Keyboard.V) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[0]});
+                    return;
+                }
+
+                // Shortcut for Tag Tool is D
+                if(evt.keyCode === Keyboard.D){
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[4]});
+                    return;
+                }
+
+                // Shortcut for Rotate Tool is W
+                if(evt.keyCode === Keyboard.W){
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[2]});
+                    return;
+                }
+
+                // Shortcut for Translate Tool is G
+                if(evt.keyCode === Keyboard.G){
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[3]});
+                    return;
+                }
+
+                // Shortcut for Rectangle Tool is R
+                // unless the user is pressing the command key.
+                // If the user is pressing the command key, they want to refresh the browser.
+                if((evt.keyCode === Keyboard.R) && !evt.metaKey) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[7]});
+                    this.application.ninja.handleSelectSubTool({"detail": this.application.ninja.toolsData.defaultToolsData[7].subtools[1]});