document controller and stage view code cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 7680103d..ba94fadf 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -120,7 +120,22 @@ exports.StageView = Montage.create(Component, {
             }
 
             this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-            this.application.ninja.documentController._showCurrentDocument();
+
+
+//            this.application.ninja.documentController._showCurrentDocument();
+            // Inline function below
+            if(this.activeDocument) {
+                this.activeDocument.container.style["display"] = "block";
+                if(this.activeDocument.currentView === "design"){
+                    this.activeDocument.container.parentNode.style["display"] = "block";
+                    this.activeDocument.restoreAppState();
+                } else {
+                    //hide the iframe when switching to code view
+                    document.getElementById("iframeContainer").style.display = "none";
+                }
+            }
+
+
             //focus editor
             if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
                 this.application.ninja.documentController.activeDocument.editor.focus();