5 files changed, 71 insertions, 20 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 64ff2c7e..194496a6 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -76,11 +76,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleWebRequest: {
         value: function (request) {
-                if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) {
+                //TODO: Check if frameId is proper
+                if (this._hackRootFlag && request.parentFrameId !== -1) {
                         //TODO: Optimize creating string
-                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
-                                }
+                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
+                                //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+                                return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]};
                         }
+                }
     },
     ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index c4623d3f..08eb018f 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -98,6 +98,8 @@ exports.SelectionController = Montage.create(Component, {
                 this._isDocument = false;
             }
             NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+
+                        this._selectionContainer = this.application.ninja.currentSelectedContainer;
         }
     },
 
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 5d507476..1691e3e4 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
 
@@ -465,11 +486,12 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                 if(this._document.styleSheets[i].rules === null) {
                                                         //TODO: Revisit URLs and URI creation logic, very hack right now
                                                         var fileUri, cssUrl, cssData, tag, query;
-                                                        if (this._document.styleSheets[i].href.indexOf('js/document/templates/montage-html') !== -1) {
+                                                        //TODO: Parse out relative URLs and map them to absolute
+                                                        if (this._document.styleSheets[i].href.indexOf(chrome.extension.getURL('')) !== -1) {
                                                                 //Getting the url of the CSS file
-                                                                cssUrl = this._document.styleSheets[i].href.split('js/document/templates/montage-html')[1];
+                                                                cssUrl = this._document.styleSheets[i].href.split('js/document/templates/montage-html')[1];//TODO: Parse out relative URLs and map them to absolute
                                                                 //Creating the URI of the file (this is wrong should not be splitting cssUrl)
-                                                                fileUri = this.application.ninja.coreIoApi.cloudData.root+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+cssUrl.split('/')[1];
+                                                                fileUri = this.application.ninja.coreIoApi.cloudData.root+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+cssUrl;
                                                                 //Loading the data from the file
                                                                 cssData = this.application.ninja.coreIoApi.readFile({uri: fileUri});
                                                                 //Creating tag with file content
@@ -485,6 +507,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                                 tag.setAttribute(this._document.styleSheets[i].ownerNode.attributes[n].name, this._document.styleSheets[i].ownerNode.attributes[n].value);
                                                                         }
                                                                 }
+                                                                //TODO: Parse out relative URLs and map them to absolute
+                                                                //console.log(cssData.content);
                                                                 tag.innerHTML = cssData.content;
                                                                 //Looping through DOM to insert style tag at location of link element
                                                                 query = this._templateDocument.html.querySelectorAll(['link']);
@@ -715,6 +739,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 +753,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);
+
+
         }
     }
         ////////////////////////////////////////////////////////////////////
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, {
                     var dataStore = window.sessionStorage;