2 files changed, 62 insertions, 3 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 142ffe4a..b7dacf6a 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -76,7 +76,7 @@ exports.HtmlDocument = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     init: {
-        value:function(file, context, callback, view, template) {
+        value: function(file, context, callback, view, template) {
             //Storing callback data for loaded dispatch
             this.loaded.callback = callback;
             this.loaded.context = context;
@@ -122,6 +122,44 @@ exports.HtmlDocument = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
+    //TODO: Make into one method to use here and one init
+    reloadView: {
+        value: function (view, template) {
+            //
+            this.model.parentContainer.removeChild(this.model.views.design.iframe);
+            //Initiliazing views and hiding
+            if (this.model.views.design.initialize(this.model.parentContainer)) {
+                //Hiding iFrame, just initiliazing
+                this.model.views.design.hide();
+                //Setting the iFrame property for reference in helper class
+                this.model.webGlHelper.iframe = this.model.views.design.iframe;
+            } else {
+                //ERROR: Design View not initialized
+            }
+            //
+            if (view === '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;
+                this.model.views.design.content = this.model.file.content;
+                //TODO: Improve reference (probably through binding values)
+                this.model.views.design._webGlHelper = this.model.webGlHelper;
+                //Rendering design view, using observers to know when template is ready
+                this.model.views.design.render(function () {
+                    //Adding observer to know when template is ready
+                    this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this));
+                    this._observer.observe(this.model.views.design.document.head, {childList: true});
+                }.bind(this), template, {viewCallback: this.handleViewReady, context: this});
+            } else {
+                //TODO: Identify default view (probably code)
+            }
+        }  
+    },
+    ////////////////////////////////////////////////////////////////////
     //
     handleTemplateReady: {
         value: function (e) {
@@ -130,6 +168,8 @@ exports.HtmlDocument = Montage.create(Component, {
             this._observer = null;
         }
     },
+    ////////////////////////////////////////////////////////////////////
+    //
     handleViewReady: {
         value: function(mObjects) {
             this.model.mObjects = mObjects;
@@ -138,7 +178,6 @@ exports.HtmlDocument = Montage.create(Component, {
             if(typeof this.model.domContainer !== "undefined") {
                 this.model.domContainer = this.model.documentRoot;
             }
-
             //Making callback after view is loaded
             this.loaded.callback.call(this.loaded.context, this);
         }
diff --git a/js/document/models/base.js b/js/document/models/base.js
index c7e2de69..a9bbd6db 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -91,6 +91,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
     _selection: {
         value: []
     },
+    ////////////////////////////////////////////////////////////////////
+    //
     domContainer: {
         value: null
     },
@@ -120,7 +122,8 @@ exports.BaseDocumentModel = Montage.create(Component, {
     libs: {
         value: null
     },
-
+    ////////////////////////////////////////////////////////////////////
+    //
     _mObjects: {
             value: []
         },
@@ -138,6 +141,23 @@ exports.BaseDocumentModel = Montage.create(Component, {
     switchViewTo: {
         value: function (view) {
             //
+            switch (view) {
+                case 'design':
+                    //
+                    if (this.views.design) this.views.design.show();
+                    if (this.views.code) this.views.code.hide();
+                    this.currentView = this.views.design;
+                    break;
+                case 'code':
+                    //
+                    if (this.views.code) this.views.code.show();
+                    if (this.views.design) this.views.design.hide();
+                    this.currentView = this.views.code;
+                    break;
+                default:
+                    //Error
+                    break;
+            }
         }
     },
     ////////////////////////////////////////////////////////////////////