Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

Conflicts:
	js/document/document-html.js
	js/helper-classes/3D/view-utils.js
	js/stage/stage.reel/stage.js

1 files changed, 10 insertions, 8 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index eecf9146..2c34eedf 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -377,10 +377,10 @@ exports.DocumentController = Montage.create(Component, {
 
             if(this._documents.length > 0) {
                 previousFocusedDocument = this._documents[this._documents.length - 1];
-                this._activeDocument = previousFocusedDocument;
-                this.switchDocuments(this.activeDocument, previousFocusedDocument, true);
+                this.activeDocument = previousFocusedDocument;
+                this.switchDocuments(this.activeDocument, previousFocusedDocument, false);
             } else {
-                this._activeDocument = null;
+                this.activeDocument = null;
                 this.application.ninja.stage.hideRulers();
 
                 this.application.ninja.stage.hideCanvas(true);
@@ -502,14 +502,16 @@ exports.DocumentController = Montage.create(Component, {
                     this.application.ninja.stage.restoreAllPanels();
                     this.application.ninja.stage.hideCanvas(false);
                     this.application.ninja.stage.showRulers();
-                } else if(currentDocument.currentView === "design" && 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();
                 }
             }
 
+            if(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();
+            }
+
             this.application.ninja.stage.clearAllCanvas();
 
             if(didCreate) {