8 files changed, 131 insertions, 45 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 02031922..64ff2c7e 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -195,7 +195,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value:function(doc){
             var response = doc || null;//default just for testing
             if(!!response && response.success && (response.status!== 500) && !!response.uri){
+
+                this.isNewFilePath = true;//path identifier flag
                 this.creatingNewFile = true;//flag for timeline to identify new file flow
+
                 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
             }else if(!!response && !response.success){
                 //Todo: restrict directory path to the sandbox, in the dialog itself
@@ -224,9 +227,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             //TODO: Add UI to handle error codes, shouldn't be alert windows
             if(!!response && (response.status === 204)) {
 
-                if((typeof this.creatingNewFile === 'undefined') || (this.creatingNewFile !== true)){//not from new file flow
+                if((typeof this.isNewFilePath === 'undefined') || (this.isNewFilePath !== true)){//not from new file flow
                     this.creatingNewFile = false;
                 }
+                this.isNewFilePath = false;//reset path identifier flag
 
                 //Sending full response object
                 this.openDocument(response);   
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index f50762f3..184c4899 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -47,6 +47,7 @@ exports.SelectionController = Montage.create(Component, {
             this.eventManager.addEventListener("elementDeleted", this, false);
             this.eventManager.addEventListener("selectAll", this, false);
             this.eventManager.addEventListener("deleteSelection", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
 //            defaultEventManager.addEventListener( "undo", this, false);
 //            defaultEventManager.addEventListener( "redo", this, false);
         }
@@ -88,6 +89,20 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
+    handleSwitchDocument: {
+        value: function() {
+            this._selectedItems = this.application.ninja.selectedElements.slice(0);
+            if(this._selectedItems.length === 0 ){
+                this._isDocument = true;
+            }else{
+                this._isDocument = false;
+            }
+            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+
+            this._selectionContainer = this.application.ninja.currentSelectedContainer;
+        }
+    },
+
     handleElementAdded: {
         value: function(event) {
             this.executeSelectElement(event.detail);
diff --git a/js/controllers/undo-controller.js b/js/controllers/undo-controller.js
index 926803d3..19cfb6e6 100755
--- a/js/controllers/undo-controller.js
+++ b/js/controllers/undo-controller.js
@@ -71,22 +71,28 @@ exports.UndoController = Montage.create( Component, {
     /**
      * Undo Queue
      */
-    _undoQueue: { value: [] },
+    _undoQueue: { value: []},
 
     undoQueue: {
         get: function() {
             return this._undoQueue;
+        },
+        set: function(value){
+            this._undoQueue = value;
         }
     },
 
     /**
      * Redo Queue
      */
-    _redoQueue: { value: [], enumerable: false },
+    _redoQueue: { value: [], enumerable: false},
 
     redoQueue: {
         get: function() {
             return this._redoQueue;
+        },
+        set: function(value){
+            this._redoQueue = value;
         }
     },
 
@@ -202,5 +208,12 @@ exports.UndoController = Montage.create( Component, {
             this.redoQueue.splice(0, this.redoQueue.length);
             //this.redoQueue = [];
         }
+    },
+
+    clearHistory:{
+        value: function(){
+            this.undoQueue.length = 0;
+            this.redoQueue.length = 0;
+        }
     }
 });
\ No newline at end of file
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 76436732..544c0ad5 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
 
@@ -677,8 +698,15 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
 
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
-                this.selectionModel = this.application.ninja.selectedElements;
+                this.selectionModel = this.application.ninja.selectedElements.slice(0);
             }
+
+            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
         }
     },
 
@@ -689,17 +717,25 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             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.selectionModel.length > 0)){
-                this.application.ninja.selectionController.initWithDocument(this.selectionModel);
-            }
 
-            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);
+
+
         }
     }
         ////////////////////////////////////////////////////////////////////
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 428e7bab..3d99ae4d 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -861,12 +861,12 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {