Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

Conflicts:
	js/document/document-html.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index d0f5b817..567e4455 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -81,7 +81,10 @@ exports.HtmlDocument = Montage.create(Component, {
                 }
             //
             if (view === 'design') {
-                this.currentView = "design";
+                //TODO: Remove reference and use as part of model
+                this.currentView = 'design';
+                //Setting current view object to design
+                this.model.currentView = this.model.views.design;
                 //Showing design iFrame
                 this.model.views.design.show();
                 this.model.views.design.iframe.style.opacity = 0;