1 files changed, 39 insertions, 9 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 5d507476..e40656a3 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -59,6 +59,27 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     _gridVerticalSpacing: {value:0},
     //end - drawUtils state
 
+    _undoStack: { value: [] },
+    undoStack: {
+        get: function() {
+            return this._undoStack;
+        },
+        set:function(value){
+            this._undoStack = value;
+        }
+    },
+
+    _redoStack: { value: [], enumerable: false },
+
+    redoStack: {
+        get: function() {
+            return this._redoStack;
+        },
+        set:function(value){
+            this._redoStack = value;
+        }
+    },
+
 
     // GETTERS / SETTERS
 
@@ -715,6 +736,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             }
 
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
+
+            //persist a clone of history per document
+            this.undoStack = this.application.ninja.undocontroller.undoQueue.slice(0);
+            this.redoStack = this.application.ninja.undocontroller.redoQueue.slice(0);
+            this.application.ninja.undocontroller.clearHistory();//clear history to give the next document a fresh start
         }
     },
 
@@ -724,20 +750,24 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         value: function () {
             this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
             this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
-
-            if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null)){
-                this.application.ninja.selectedElements = this.selectionModel.slice(0);
-            }
-
-            if((this.savedLeftScroll!== null) && (this.savedTopScroll !== null)){
+           
+            if((this.savedLeftScroll !== null) && (this.savedTopScroll !== null)){
                 this.application.ninja.stage._iframeContainer.scrollLeft = this.savedLeftScroll;
-                this.application.ninja.stage._scrollLeft = this.savedLeftScroll;
                 this.application.ninja.stage._iframeContainer.scrollTop = this.savedTopScroll;
-                this.application.ninja.stage._scrollLeft = this.savedTopScroll;
+                this.application.ninja.stage.handleScroll();
+            }
+
+            this.application.ninja.currentSelectedContainer = this.documentRoot;
+            if(this.selectionModel){
+                this.application.ninja.selectedElements = this.selectionModel.slice(0);
             }
-            this.application.ninja.stage.handleScroll();
 
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
+
+            this.application.ninja.undocontroller.undoQueue = this.undoStack.slice(0);
+            this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0);
+
+
         }
     }
         ////////////////////////////////////////////////////////////////////