2 files changed, 29 insertions, 2 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 95aec2a3..7dad7aca 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -101,7 +101,10 @@ exports.ElementMediator = Montage.create(NJComponent, {
             {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
-            if(!noEvent) NJevent("elementAdded", el);
+            if(!noEvent) {
+                this.application.ninja.documentController.activeDocument.markEdited();
+                NJevent("elementAdded", el);
+            }
         }
     },
 
@@ -127,6 +130,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
+            this.application.ninja.documentController.activeDocument.markEdited();
             NJevent("elementDeleted", el);
         }
     },
@@ -185,6 +189,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 NJUtils.makeElementModel(el, "Canvas", "block", true);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             return el.elementModel.controller["setShapeProperty"](el, prop, value);
         }
     },
@@ -252,6 +258,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
 
             item.elementModel.controller["setAttribute"](item, att, value);
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("attribute" + eventType, {type : "setAttribute", source: source, data: {"els": el, "prop": att, "value": value}, redraw: null});
         }
     },
@@ -324,6 +332,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setProperty"](el, p, value[i]);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("element" + eventType, {type : "setProperty", source: source, data: {"els": els, "prop": p, "value": value}, redraw: null});
         }
     },
@@ -383,6 +393,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setProperties"](el, props, i);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("element" + eventType, {type : "setProperties", source: source, data: {"els": els, "prop": props, "value": props}, redraw: null});
         }
     },
@@ -455,6 +467,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["set3DProperties"](el, props, i, update3DModel);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("element" + eventType, {type : "set3DProperties", source: source, data: {"els": els, "prop": "matrix", "value": props}, redraw: null});
         }
     },
@@ -539,6 +553,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setColor"](el, value, isFill);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("element" + eventType, {type : "setColor", source: source, data: {"els": els, "prop": "color", "value": value, "isFill": isFill}, redraw: null});
         }
     },
@@ -620,6 +636,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setStroke"](el, value);
             }
 
+            this.application.ninja.documentController.activeDocument.markEdited();
+
             NJevent("element" + eventType, {type : "setStroke", source: source, data: {"els": els, "prop": "stroke", "value": value}, redraw: null});
         }
     },
@@ -694,6 +712,8 @@ exports.ElementMediator = Montage.create(NJComponent, {
             }
             else
             {
+                this.application.ninja.documentController.activeDocument.markEdited();
+
                 NJevent("elementChange", {type : "setMatrix", source: null, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
             }
         }
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index a1fdead3..e348a09b 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -85,7 +85,7 @@ exports.KeyboardMediator = Montage.create(Component, {
 
     handleKeydown: {
         value: function(evt) {
-            if(document.activeElement.nodeName !== "BODY") {
+            if((document.activeElement.nodeName !== "BODY") && (this.application.ninja.documentController.activeDocument.currentView === "design")) {
                 // Don't do anything if an input or other control is focused
                 return;
             }
@@ -110,6 +110,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");