Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html

1 files changed, 3 insertions, 4 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7795a74d..c6bf4c6b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -427,10 +427,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.needsSave === true){
-                //if file dirty then alert user to save
-        }
-
             var doc = this._findDocumentByUUID(id);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
@@ -490,6 +486,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.webTemplate = false;
 
             NJevent("onOpenDocument", doc);
+
+                        this.application.ninja.stage.stageView.showCodeViewBar(false);
+            this.application.ninja.stage.stageView.restoreAllPanels();
         }
     },