10 files changed, 164 insertions, 26 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index d5d0cf42..02031922 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -195,6 +195,7 @@ 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.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
@@ -222,6 +223,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value:function(response){
             //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
+                    this.creatingNewFile = false;
+                }
+
                 //Sending full response object
                 this.openDocument(response);   
             } else if (!!response && (response.status === 404)){
@@ -332,6 +338,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                 this.application.ninja.stage.hideCanvas(true);
             }
+
+            NJevent("closeDocument", doc.uri);
+
+            doc=null;
         }
     },
 
@@ -339,7 +349,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     // Event Detail: Contains the current ActiveDocument
     _onOpenDocument: {
         value: function(doc){
-            //var data = DocumentManager.activeDocument;
+            this.application.ninja.currentDocument = doc;
             this._hideCurrentDocument();
             this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
 
@@ -423,7 +433,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             if(this.activeDocument) {
                 if(this.activeDocument.currentView === "design"){
-                    this.application.ninja.stage.saveScroll();
+                    this.activeDocument.saveAppState();
                     this.activeDocument.container.parentNode.style["display"] = "none";
                     this.application.ninja.stage.hideCanvas(true);
                     this.application.ninja.stage.stageView.hideRulers();
@@ -440,7 +450,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 this.activeDocument.container.style["display"] = "block";
                 if(this.activeDocument.currentView === "design"){
                     this.activeDocument.container.parentNode.style["display"] = "block";
-                    this.application.ninja.stage.restoreScroll();
+                    this.activeDocument.restoreAppState();
                     this.application.ninja.stage.hideCanvas(false);
                     this.application.ninja.stage.stageView.showRulers();
                 }else{
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 46e82ace..ec0335b4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -27,7 +27,11 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
     
     getProperty: {
         value: function(el, prop, fallbackOnComputed, isStageElement) {
-            return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement);
+            if(el.nodeType !== 3){
+                return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement);
+            }else{
+                return null;
+            }
         }
     },
 
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index d69b53e0..f50762f3 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -58,6 +58,7 @@ exports.SelectionController = Montage.create(Component, {
     handleOpenDocument: {
         value: function() {
             // Handle initializing the selection array here.
+            this.initWithDocument([]);
         }
     },
     
@@ -70,6 +71,14 @@ exports.SelectionController = Montage.create(Component, {
                 if(currentSelectionArray.length >= 1) {
                     this._selectedItems = currentSelectionArray;
                     this._isDocument = false;
+
+
+
+                    this.application.ninja.selectedElements = currentSelectionArray;
+                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+
+
+
                 }
             }
 
diff --git a/js/document/html-document.js b/js/document/html-document.js
index ca1b0886..1901079d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -54,6 +54,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     },
 
 
+    //drawUtils state
+    _gridHorizontalSpacing: {value:0},
+    _gridVerticalSpacing: {value:0},
+    //end - drawUtils state
+
 
     // GETTERS / SETTERS
 
@@ -72,6 +77,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         set: function(value) { this._savedTopScroll = value}
     },
 
+    gridHorizontalSpacing:{
+        get: function() { return this._gridHorizontalSpacing; },
+        set: function(value) { this._gridHorizontalSpacing = value}
+    },
+
+    gridVerticalSpacing:{
+        get: function() { return this._gridVerticalSpacing; },
+        set: function(value) { this._gridVerticalSpacing = value}
+    },
+
     selectionExclude: {
         get: function() { return this._selectionExclude; },
         set: function(value) { this._selectionExclude = value; }
@@ -616,7 +631,43 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         //Error
                 }
         }
-        }
+        },
         ////////////////////////////////////////////////////////////////////
+    saveAppState:{
+        enumerable: false,
+        value: function () {
+
+            this.savedLeftScroll = this.application.ninja.stage._iframeContainer.scrollLeft;
+            this.savedTopScroll = this.application.ninja.stage._iframeContainer.scrollTop;
+
+            this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing;
+            this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
+
+            if(typeof this.application.ninja.selectedElements !== 'undefined'){
+                this.selectionModel = this.application.ninja.selectedElements;
+            }
+        }
+    },
+
+    ////////////////////////////////////////////////////////////////////
+    restoreAppState:{
+        enumerable: false,
+        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.selectionModel.length > 0)){
+                this.application.ninja.selectionController.initWithDocument(this.selectionModel);
+            }
+
+            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();
+        }
+    }
         ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index c07391db..85870097 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -115,6 +115,26 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {