2 files changed, 128 insertions, 113 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 95aec2a3..51923f08 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -28,13 +28,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     // TODO use the specific controller to be able to subclass the functionality
     handleElementAdding: {
         value: function(event) {
-            /*
-            var cmd = ElementControllerCommands.addElementCommand(event.detail.el, event.detail.data);
-            NJevent("sendToUndo", cmd);
-            cmd.execute();
-            */
             this.addElement(event.detail.el, event.detail.data);
-
         }
     },
 
@@ -97,11 +91,13 @@ exports.ElementMediator = Montage.create(NJComponent, {
         value: function(el, rules, noEvent) {
             ElementController.addElement(el, rules);
             var p3d = this.get3DProperties(el);
-            if(p3d)
-            {
+            if(p3d) {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
-            if(!noEvent) NJevent("elementAdded", el);
+            if(!noEvent) {
+                this.application.ninja.documentController.activeDocument.needsSave = true;
+                NJevent("elementAdded", el);
+            }
         }
     },
 
@@ -127,6 +123,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
+            this.application.ninja.documentController.activeDocument.needsSave = true;
             NJevent("elementDeleted", el);
         }
     },
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index e8a11ad8..0282060f 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -85,22 +85,115 @@ exports.KeyboardMediator = Montage.create(Component, {
 
     handleKeydown: {
         value: function(evt) {
-            if(document.activeElement.nodeName !== "BODY") {
-                // 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]});
+                    return;
+                }
+
+                // Shortcut for Oval Tool is O
+                if(evt.keyCode === Keyboard.O) {
+                    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[0]});
+                    return;
+                }
+
+                // Shortcut for Line Tool is L
+                if(evt.keyCode === Keyboard.L ) {
+                    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[2]});
+                    return;
+                }
+
+                if(evt.keyCode === Keyboard.H ) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
+                    return;
+                }
+
+                if(evt.keyCode === Keyboard.Z ) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]});
+                    return;
+                }
+
+                // Check if cmd+a/ctrl+a for Select All
+                if((evt.keyCode == Keyboard.A) && (evt.ctrlKey || evt.metaKey)) {
+                    NJevent("selectAll");
+                    return;
+                }
+
+                if(evt.keyCode === Keyboard.ESCAPE){//ESC key
+                    //console.log("ESC key pressed");
+                    if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleEscape(evt);
+                    //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar");
+                }
+
+
+                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);
 
-            // Check DELETE OR BACKSPACE
-            if((evt.keyCode == Keyboard.BACKSPACE) || (evt.keyCode == Keyboard.DELETE)) {
-                evt.stopImmediatePropagation();
-                evt.preventDefault();
-                NJevent("deleting");
-                return;
             }
 
             // Check if cmd+z/ctrl+z for Undo (Windows/Mac)
@@ -110,6 +203,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                 return;
             }
 
+            // Check if cmd+s/ctrl+s for Save (Windows/Mac)
+            if ((evt.keyCode == Keyboard.S) && (evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {
+                NJevent("executeSave");
+                evt.preventDefault();
+                return;
+            }
+
             // Check if cmd+shift+z for Redo (Mac)
             if ((evt.keyCode == Keyboard.Z) && evt.metaKey && evt.shiftKey) {
                 NJevent("executeRedo");
@@ -124,103 +224,21 @@ exports.KeyboardMediator = Montage.create(Component, {
                 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){