1 files changed, 5 insertions, 17 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index e059e7e1..f85e2f97 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -54,6 +54,7 @@ exports.DocumentController = Montage.create(Component, {
                 document.getElementById("codeViewContainer").style.display = "block";
             } else if(this._currentDocument.currentView === "design") {
                 this._currentDocument.model.currentView.show();
+                this._currentDocument.model.views.design._liveNodeList = this._currentDocument.model.documentRoot.getElementsByTagName('*');
             } else {
                 document.getElementById("iframeContainer").style.display = "none";
                 this._currentDocument.model.currentView.show();
@@ -149,10 +150,10 @@ exports.DocumentController = Montage.create(Component, {
     handleExecuteSave: {
         value: function(event) {
                 //
-                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
                         //Currently we don't need a callback handler
                         //this.activeDocument.model.save(this.saveExecuted.bind(this));
-                        this.activeDocument.model.save();
+                        this.currentDocument.model.save();
                 } else {
                         //Error: cloud not available and/or no active document
                 }
@@ -193,16 +194,13 @@ exports.DocumentController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     handleExecuteFileClose:{
         value: function(event) {
-                if (this.activeDocument) {
-                this.closeFile(this.activeDocument);
-                }
+            this.closeFile(this.currentDocument);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //TODO: Is this used, should be cleaned up
     handleExecuteFileCloseAll:{
                 value: function(event) {
-                        var i=0;//TODO: who is using this??
                         if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
                                 while(this._documents.length > 0){
                                         this.closeDocument(this._documents[this._documents.length -1].uuid);
@@ -355,14 +353,8 @@ exports.DocumentController = Montage.create(Component, {
             if(currentDocument) {
                 if(currentDocument.currentView === "design") {
                     currentDocument.serializeDocument();
-                    this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null;
-                    currentDocument.model.views.design.propertiesPanel.clear();
                 }
 
-                currentDocument.model.isActive = false;
-
-                currentDocument.model.currentView.hide();
-
                 if(currentDocument.model.parentContainer !== newDocument.model.parentContainer) {
                     currentDocument.model.parentContainer.style["display"] = "none";
                     newDocument.model.parentContainer.style["display"] = "block";
@@ -383,13 +375,9 @@ exports.DocumentController = Montage.create(Component, {
                 this.application.ninja.stage.hideRulers();
             }
 
-//            this.application.ninja.stage.clearAllCanvas();
-
             if(didCreate) {
-//                newDocument.model.currentView.show();
-
                 if(newDocument.currentView === "design") {
-                    NJevent("onOpenDocument", newDocument);
+
                 } else {
                     newDocument.model.parentContainer.style["display"] = "block";
                 }