Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/components/layout/tools-properties.reel/tools-properties.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7795a74d..803519a7 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -366,7 +366,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                                 case 'html':
                                         //Open in designer view
                     this._hackRootFlag = false;
-                    Montage.create(Document).init(doc, this, this._onOpenDocument);
+                    Montage.create(Document).init(doc, this, this._onOpenDocument, 'design');
                                         break;
                                 default:
                                         //Open in code view
@@ -490,6 +490,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();
         }
     },