8 files changed, 80 insertions, 164 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index cf46e73e..50874725 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -454,58 +454,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     // Open document callback
     _onOpenDocument: {
         value: function(doc){
-
+            var currentDocument;
             if(this.activeDocument) {
                 // There is a document currently opened
-
-
+                currentDocument = this.activeDocument;
 
                 //this.application.ninja.stage.stageView.showCodeViewBar(false);
                 //this.application.ninja.stage.stageView.restoreAllPanels();
 
-                //
-                /*
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.saveAppState();
-                    this.activeDocument.container.parentNode.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
-                }
+                //this.activeDocument.saveAppState();
 
-                this.activeDocument.container.style["display"] = "none";
-                */
-
-                /*
-                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";
-                                }
-
-                */
-                // hide current document
+                // TODO: Do we need this?
+                //this.application.ninja.stage.hideCanvas(true);
+                //this.application.ninja.stage.stageView.hideRulers();
+
+                //this.activeDocument.restoreAppState();             
             } else {
                 // There is no document opened
 
-                // Set the active document
-                this.activeDocument = doc;
+                // Show the rulers
+                // TODO: Move this indo design view
+                this.application.ninja.stage.stageView.showRulers();
 
                 // Show the canvas
                 this.application.ninja.stage.hideCanvas(false);
+            }
 
-                // Show the rulers
-                // TODO: Move this indo design view
-                this.application.ninja.stage.stageView.showRulers();
 
-                // Initialize the documentRoot styles
-                this.initializeRootStyles(doc.documentRoot);
-                // Flag to stop stylesheet dirty event
-                this._hackInitialStyles = false;
+            // Set the active document
+            this.activeDocument = doc;
+
+            // Initialize the documentRoot styles
+            this.initializeRootStyles(doc.documentRoot);
+            // Flag to stop stylesheet dirty event
+            this._hackInitialStyles = false;
+
+            this.switchDocuments(currentDocument, doc);
+
+            NJevent("onOpenDocument", doc);
+
+            //Setting opacity to be viewable after load
+            //doc.model.views.design.iframe.style.opacity = 1;
+
+        }
+    },
+
+    switchDocuments: {
+        value: function(current, newDocument) {
+            newDocument.model.views.design.iframe.style.opacity = 1;
 
-                NJevent("onOpenDocument", doc);
+            if(current) {
+                current.model.views.design.hide();
             }
         }
     },
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 56d9db02..c77ed7bc 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -119,8 +119,6 @@ exports.HtmlDocument = Montage.create(Component, {
                 this._observer = null;
                 //Making callback after view is loaded
             this.loaded.callback.call(this.loaded.context, this);
-            //Setting opacity to be viewable after load
-                        this.model.views.design.iframe.style.opacity = 1;
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a6d2d899..a8bc16ef 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -138,7 +138,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     l,
                     t,
                     plane,
-                    elt
+                    elt;
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 2e8020d3..7194524e 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,7 +21,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    currentStage: { value: null, writable: true },
     drawingCanvas: { value: null, writable: true},
     
         // we keep a stack of working planes to facilitate working on other planes temporarily
@@ -84,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.currentStage.offsetWidth);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.currentStage.offsetHeight);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.currentStage;    }},
+    getStage : { value: function()              {        return this.application.ninja.currentDocument.documentRoot;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -185,12 +184,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         }
     },
 
-    setCurrentStage: {
-        value: function(stage) {
-            this.currentStage = stage;
-        }
-    },
-
         snap : {
                 value: function (xScreen, yScreen, snap3D,  quadPt) 
                 {
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 8c338f84..20f61be1 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -18,18 +18,14 @@ exports.ViewUtils = Montage.create(Component, {
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 
-    m_viewportObj : { value: null, writable: true},
-    _perspectiveDist: { value: null, writable: true},
+    m_viewportObj : { value: null},
+    _perspectiveDist: { value: null},
 
     // keep a stack of viewport objects
-    _viewportObjStack: { value: [], writable: true },
+    _viewportObjStack: { value: []},
 
-    _currentDocument: { value: null , writable: true},
-    _userContentLeft: { value: null , writable: true},
-    _userContentTop: { value: null , writable: true},
-
-    _rootElement: { value: null, writable: true},
-    _stageElement: { value: null, writable: true},
+    _userContentLeft: { value: null},
+    _userContentTop: { value: null},
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
@@ -43,18 +39,9 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },