3 files changed, 24 insertions, 12 deletions

diff --git a/js/document/text-document.js b/js/document/text-document.js
index 6f8efaad..f74742ad 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -191,5 +191,17 @@ var TextDocument = exports.TextDocument = Montage.create(Montage, {
         value: function() {
             // Have the XHR here?
         }
+    },
+
+    markDocumentEditted:{
+        value: function() {
+            this.dirtyFlag = true;
+        }
+    },
+
+    markDocumentUneditted:{
+        value: function() {
+            this.dirtyFlag = false;
+        }
     }
 });
\ No newline at end of file
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index ad01fe2d..559cb44c 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -102,7 +102,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
             if(!noEvent) {
-                this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+                this.application.ninja.documentController.activeDocument.markDocumentEditted();
                 NJevent("elementAdded", el);
             }
         }
@@ -130,7 +130,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     _removeElement: {
         value: function(el, rules) {
             ElementController.removeElement(el, rules);
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
             NJevent("elementDeleted", el);
         }
     },
@@ -189,7 +189,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 NJUtils.makeElementModel(el, "Canvas", "block", true);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             return el.elementModel.controller["setShapeProperty"](el, prop, value);
         }
@@ -258,7 +258,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
 
             item.elementModel.controller["setAttribute"](item, att, value);
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("attribute" + eventType, {type : "setAttribute", source: source, data: {"els": el, "prop": att, "value": value}, redraw: null});
         }
@@ -332,7 +332,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setProperty"](el, p, value[i]);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("element" + eventType, {type : "setProperty", source: source, data: {"els": els, "prop": p, "value": value}, redraw: null});
         }
@@ -393,7 +393,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setProperties"](el, props, i);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("element" + eventType, {type : "setProperties", source: source, data: {"els": els, "prop": props, "value": props}, redraw: null});
         }
@@ -467,7 +467,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["set3DProperties"](el, props, i, update3DModel);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("element" + eventType, {type : "set3DProperties", source: source, data: {"els": els, "prop": "matrix", "value": props}, redraw: null});
         }
@@ -553,7 +553,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setColor"](el, value, isFill);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("element" + eventType, {type : "setColor", source: source, data: {"els": els, "prop": "color", "value": value, "isFill": isFill}, redraw: null});
         }
@@ -636,7 +636,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
                 el.elementModel.controller["setStroke"](el, value);
             }
 
-            this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+            this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
             NJevent("element" + eventType, {type : "setStroke", source: source, data: {"els": els, "prop": "stroke", "value": value}, redraw: null});
         }
@@ -712,7 +712,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
             }
             else
             {
-                this.application.ninja.documentController.activeDocument.dirtyFlag = true;
+                this.application.ninja.documentController.activeDocument.markDocumentEditted();
 
                 NJevent("elementChange", {type : "setMatrix", source: null, data: {"els": [el], "prop": "matrix", "value": mat}, redraw: null});
             }
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index cd19f361..7ee41fb4 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -98,9 +98,9 @@ exports.StageView = Montage.create(Component, {
                        onChange: function(){
                            var historySize = doc.editor.historySize();
                            if(historySize.undo>0){
-                                doc.dirtyFlag=true;
+                                doc.markDocumentEditted();
                            }else if(historySize.undo===0 && historySize.redo>0){
-                               doc.dirtyFlag=false;
+                               doc.markDocumentUneditted();
                            }
                        },
                        onCursorActivity: function() {