3 files changed, 50 insertions, 51 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a795d652..86b1d057 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -146,18 +146,19 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function(event) {
                 //
                 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                        //
-                        this.activeDocument.model.save(this.testCallback.bind(this)); //this.fileSaveResult.bind(this)
+                        //Currently we don't need a callback handler
+                        //this.activeDocument.model.save(this.saveExecuted.bind(this));
+                        this.activeDocument.model.save();
                 } else {
-                        //Error:
+                        //Error: cloud not available and/or no active document
                 }
                 }
     },
-    testCallback: {
+    ////////////////////////////////////////////////////////////////////
+        //
+    saveExecuted: {
         value: function (value) {
-                console.log(value);
-            //TODO: Move this to the model.save()
-            this.activeDocument.model.needsSave = false;
+                //File saved, any callbacks or events should go here
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -178,8 +179,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function(event) {
             var saveAsSettings = event._event.settings || {};
             if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                saveAsSettings.fileName = this.activeDocument.name;
-                saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/"));
+                saveAsSettings.fileName = this.activeDocument.model.file.name;
+                saveAsSettings.folderUri = this.activeDocument.model.file.uri.substring(0, this.activeDocument.model.file.uri.lastIndexOf("/"));
                 saveAsSettings.callback = this.saveAsCallback.bind(this);
                 this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings);
             }
@@ -453,58 +454,56 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     // Open document callback
     _onOpenDocument: {
         value: function(doc){
-
+            var currentDocument;
             if(this.activeDocument) {
                 // There is a document currently opened
+                currentDocument = this.activeDocument;
 
-
-
-                //this.application.ninja.stage.stageView.showCodeViewBar(false);
                 //this.application.ninja.stage.stageView.restoreAllPanels();
-
-                //
-                /*
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.saveAppState();
-                    this.activeDocument.container.parentNode.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
-                }
-
-                this.activeDocument.container.style["display"] = "none";
-                */
-
-                /*
-                this.activeDocument.container.style["display"] = "block";
-                                if(this.activeDocument.currentView === "design"){
-                                    this.activeDocument.container.parentNode.style["display"] = "block";
-                                    this.activeDocument.restoreAppState();
-                                }else{
-                                    //hide the iframe when switching to code view
-                                    document.getElementById("iframeContainer").style.display = "none";
-                                }
-
-                */
-                // hide current document
             } else {
                 // There is no document opened
 
-                // Set the active document
-                this.activeDocument = doc;
+                // Show the rulers
+                // TODO: Move this indo design view
+                this.application.ninja.stage.stageView.showRulers();
 
                 // Show the canvas
                 this.application.ninja.stage.hideCanvas(false);
+            }
 
-                // Show the rulers
-                // TODO: Move this indo design view
-                this.application.ninja.stage.stageView.showRulers();
+            // Set the active document
+            this.activeDocument = doc;
+
+            // Initialize the documentRoot styles
+            this.initializeRootStyles(doc.documentRoot);
+            // Flag to stop stylesheet dirty event
+            this._hackInitialStyles = false;
 
-                // Initialize the documentRoot styles
-                this.initializeRootStyles(doc.documentRoot);
-                // Flag to stop stylesheet dirty event
-                this._hackInitialStyles = false;
+            this.switchDocuments(currentDocument, doc, true);
+        }
+    },
+
+    switchDocuments: {
+        value: function(currentDocument, newDocument, didCreate) {
+
+            if(currentDocument) {
+                currentDocument.serializeDocument();
 
-                NJevent("onOpenDocument", doc);
+                this.application.ninja.selectionController._selectionContainer = null;
+                currentDocument.model.views.design.propertiesPanel.clear();
+                currentDocument.model.views.design.hide();
+            }
+
+            this.application.ninja.stage.clearAllCanvas();
+
+            if(didCreate) {
+                newDocument.model.views.design.iframe.style.opacity = 1;
+                NJevent("onOpenDocument", newDocument);
+            } else {
+                this.activeDocument = newDocument;
+                newDocument.model.views.design.show();
+                newDocument.deserializeDocument();
+                NJevent("onSwitchDocument");
             }
         }
     },
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 5c23dcf7..7a3a66f5 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -30,7 +30,7 @@ exports.BodyController = Montage.create(ElementController, {
         value: function(el, p) {
             switch(p) {
                 case "background" :
-                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true));
+                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true));
                 case "border":
                     return 0;
                 case "height":
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 6e40abb5..1092615a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -81,10 +81,10 @@ exports.SelectionController = Montage.create(Component, {
 
     handleSwitchDocument: {
         value: function() {
-            if(this.application.ninja.documentController.activeDocument.currentView === "design"){
+//            if(this.application.ninja.documentController.activeDocument.currentView === "design"){
                 this._isDocument = this.application.ninja.selectedElements.length === 0;
                 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
-            }
+//            }
         }
     },