3 files changed, 17 insertions, 4 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index d5d0cf42..e221df68 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -339,7 +339,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 +423,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 +440,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} );
+
+
+
                 }
             }