6 files changed, 124 insertions, 99 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 50b3624c..24c7737c 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -122,7 +122,7 @@ exports.DocumentEntry = Montage.create(Component, {
                 this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
             } else {
                 if(!this.active) {
-                    this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
+                    this.application.ninja.documentController.switchDocuments(this.application.ninja.documentController.activeDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
                 }
             }
         }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 814a30e1..26c3ebaa 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -52,10 +52,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(!!this._activeDocument){
                 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
                 this._activeDocument.isActive = true;
-
-                if(!!this._activeDocument.editor){
-                    this._activeDocument.editor.focus();
-                }
             }
         }
     },
@@ -312,10 +308,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.activeDocument.uri = fileUri;
             //save a new file
             //use the ioMediator.fileSaveAll when implemented
-            this.activeDocument._userDocument.name=filename;
-            this.activeDocument._userDocument.root=destination;
-            this.activeDocument._userDocument.uri=fileUri;
-            this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            this.activeDocument.model.file.name=filename;
+            this.activeDocument.model.file.uri=fileUri;
+            this.activeDocument.model.save();
             //
         }
     },
@@ -408,7 +403,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             this._activeDocument = null;
 
-            this.application.ninja.stage.stageView.hideRulers();
+            this.application.ninja.stage.hideRulers();
 
 //            document.getElementById("iframeContainer").style.display="block";
 
@@ -471,7 +466,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                 // Show the rulers
                 // TODO: Move this indo design view
-                this.application.ninja.stage.stageView.showRulers();
+                this.application.ninja.stage.showRulers();
 
                 // Show the canvas
                 this.application.ninja.stage.hideCanvas(false);
@@ -489,53 +484,81 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
+
+    _onOpenTextDocument: {
+        value: function(doc) {
+            var currentDocument=null;
+            if(this.activeDocument) {
+                // There is a document currently opened
+                currentDocument = this.activeDocument;
+            }
+
+            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
+            this.activeDocument = doc;
+            document.getElementById("iframeContainer").style.display = "none";
+            this.application.ninja.codeEditorController.applySettings();
+            this.switchDocuments(currentDocument, doc, true);
+        }
+    },
+
     switchDocuments: {
         value: function(currentDocument, newDocument, didCreate) {
 
-            if(currentDocument) {
+            if(currentDocument && currentDocument.currentView === "design") {
                 currentDocument.serializeDocument();
-
                 this.application.ninja.selectionController._selectionContainer = null;
                 currentDocument.model.views.design.propertiesPanel.clear();
-                currentDocument.model.views.design.hide();
             }
 
-            this.application.ninja.stage.clearAllCanvas();
+            if(currentDocument) {
+                currentDocument.model.currentView.hide();
+                currentDocument.model.isActive = false;
+            }
+            if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){
+                currentDocument.model.parentContainer.style["display"] = "none";
+            }
 
-            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");
+            if(newDocument && newDocument.currentView === "code"){
+                this.application.ninja.stage.showCodeViewBar(true);
+                this.application.ninja.stage.collapseAllPanels();
+                this.application.ninja.stage.hideCanvas(true);
+                this.application.ninja.stage.hideRulers();
+
+                newDocument.model.views.code.editor.focus();
+
+            }else if(currentDocument && newDocument && newDocument.currentView === "design"){
+                this.application.ninja.stage.showCodeViewBar(false);
+                this.application.ninja.stage.restoreAllPanels();
+                this.application.ninja.stage.hideCanvas(false);
+                this.application.ninja.stage.showRulers();
             }
-        }
-    },
 
+            this.application.ninja.stage.clearAllCanvas();
 
-    _onOpenTextDocument: {
-        value: function(doc) {
-            if(this.activeDocument) {
+            if(didCreate) {
+                newDocument.model.currentView.show();
+                newDocument.model.parentContainer.style["display"] = "block";
+                if(newDocument.currentView === "design") {
+                    newDocument.model.views.design.iframe.style.opacity = 1;
+                    NJevent("onOpenDocument", newDocument);
+                }
+            }
+            else {
+                this.activeDocument = newDocument;
 
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.saveAppState();
-                    this.activeDocument.parentContainer.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
+                newDocument.model.currentView.show();
+                if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){
+                    newDocument.model.parentContainer.style["display"] = "block";
                 }
 
-                this.activeDocument.container.style["display"] = "none";
+                if(newDocument.currentView === "design") {
+                    newDocument.deserializeDocument();
+                    NJevent("onSwitchDocument");
+                }else{
+                    newDocument.model.isActive = true;
+                    this.application.ninja.codeEditorController.applySettings();//should be called after activeDocument is updated
+                }
             }
-
-            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-            this.activeDocument = doc;
-            //hide the iframe when switching to code view
-            document.getElementById("iframeContainer").style.display = "none";
-            doc.model.views.code.showCodeViewBar(true);
-            this.application.ninja.codeEditorController.applySettings();
-            doc.model.views.code.collapseAllPanels();
         }
     },
 
diff --git a/js/document/models/text.js b/js/document/models/text.js
index fe02953c..d1252b7d 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -60,8 +60,8 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
                 }
                 //
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
-                this.views.code.restoreAllPanels();
-                this.views.code.showCodeViewBar(false);
+                this.application.ninja.stage.showCodeViewBar(false);
+                this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;
 
                 //
diff --git a/js/document/views/code.js b/js/document/views/code.js
index 711479a8..66d1c702 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -140,56 +140,30 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
     },
     ////////////////////////////////////////////////////////////////////
     //
-
-    showRulers:{
-        value:function(){
-            this.application.ninja.rulerTop.style.display = "block";
+    show: {
+        value: function (callback) {
+            this.textViewContainer.style.display = "block";
+            //