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

4 files changed, 35 insertions, 140 deletions

diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 1825eb06..0d53696b 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -11,8 +11,7 @@ var Montage = 			require("montage/core/core").Montage,
     drawUtils =                 require("js/helper-classes/3D/draw-utils").DrawUtils,
     ElementPlanes =     require("js/helper-classes/3D/element-planes").ElementPlanes,
     MathUtilsClass =    require("js/helper-classes/3D/math-utils").MathUtilsClass,
-    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils,
-    DrawingToolBase =   require("js/tools/drawing-tool-base").DrawingToolBase;
+    VecUtils =                  require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.StageDeps = Montage.create(Component, {
     viewUtils: {
@@ -27,24 +26,6 @@ exports.StageDeps = Montage.create(Component, {
         value: drawUtils
     },
 
-    currentStage: {
-        value: null
-    },
-    
-    _currentDocument: {
-        value: null
-    },
-
-    currentDocument: {
-        get: function() { return this._currentDocument; },
-        set: function(value) {
-            if(value) {
-                this._currentDocument = value;
-                this.currentStage = value.documentRoot;
-            }
-        }
-    },
-
     _userContentLeft: {
         value: null
     },
@@ -74,8 +55,9 @@ exports.StageDeps = Montage.create(Component, {
     deserializedFromTemplate: {
         value: function() {
 
-            this.eventManager.addEventListener( "appLoaded", this, false);
-            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener("appLoaded", this, false);
+            this.eventManager.addEventListener("openDocument", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
 
             // Initialize Deps
             // HACK
@@ -112,7 +94,9 @@ exports.StageDeps = Montage.create(Component, {
             // bind the snap properties to the snap manager
             snapManager.bindSnap();
 
-
+            drawUtils.viewUtils = viewUtils;
+            drawUtils.snapManager = snapManager;
+            drawUtils.ElementPlanes = ElementPlanes;
         }
     },
 
@@ -121,53 +105,22 @@ exports.StageDeps = Montage.create(Component, {
 
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
-
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.currentStage);
-
-            drawUtils.viewUtils = viewUtils;
-            drawUtils.snapManager = snapManager;
-            drawUtils.ElementPlanes = ElementPlanes;
-
-            snapManager._isCacheInvalid=true;
-
-            snapManager.setupDragPlaneFromPlane ( workingPlane );
-
-            DrawingToolBase.stage = this.currentStage;
-            DrawingToolBase.stageComponent = this.stage;
+            snapManager.reload2DCache();
+            snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();
         }
     },
 
-    reinitializeForSwitchDocument: {
-        value: function() {
-
+    handleSwitchDocument: {
+        value: function(){
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
+            snapManager.setupDragPlaneFromPlane (workingPlane);
+            snapManager.reload2DCache();
 
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.currentStage);
-
-            drawUtils.viewUtils = viewUtils;
-            drawUtils.snapManager = snapManager;
-            drawUtils.ElementPlanes = ElementPlanes;
-
-            snapManager._isCacheInvalid=true;
-
-            snapManager.setupDragPlaneFromPlane ( workingPlane );
-
-            DrawingToolBase.stage = this.currentStage;
-            DrawingToolBase.stageComponent = this.stage;
 
             drawUtils.initializeFromDocument();
         }
     }
-
-
-
 });
\ No newline at end of file
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index e8f29306..139fa032 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -37,28 +37,6 @@ exports.StageView = Montage.create(Component, {
      */
     switchDocument:{
         value: function(doc){
-            this.application.ninja.documentController._hideCurrentDocument();
-            this.application.ninja.documentController.activeDocument = doc;
-
-            if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument;
-            }
-
-            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-
-
-//            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
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 88cd6149..30c3d231 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -22,9 +22,6 @@
                 "prototype": "js/stage/stage-deps",
                 "properties": {
                     "stage": {"@": "owner"}
-                },
-                "bindings": {
-                    "currentDocument": {"<-": "@owner.activeDocument"}
                 }
             },
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index cac99326..73d3aaf4 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -108,7 +108,6 @@ exports.Stage = Montage.create(Component, {
     // We will set this to false while moving objects to improve performance
     showSelectionBounds: { value: true },
 
-    _documentRoot:          { value: null },
     _viewport:              { value: null },
     _documentOffsetLeft:    { value: 0 },
     _documentOffsetTop:     { value: 0 },
@@ -121,11 +120,6 @@ exports.Stage = Montage.create(Component, {
     _maxHorizontalScroll:   { value: 0 },
     _maxVerticalScroll:     { value: 0 },
 
-    documentRoot: {
-        get: function () { return this._documentRoot; },
-        set: function(value) { this._documentRoot = value; }
-    },
-
     viewport: {
         get: function () { return this._viewport; },
         set: function(value) { this._viewport = value; }
@@ -195,10 +189,7 @@ exports.Stage = Montage.create(Component, {
         set: function(value) {
             this._userPaddingLeft = value;
             this._documentOffsetLeft = -value;
-            if(!this._documentRoot) {
-                this._documentRoot = this.application.ninja.currentDocument.documentRoot;
-            }
-            this._documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
+            this.application.ninja.currentDocument.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
             this.userContentLeft = this._documentOffsetLeft;
             this.updatedStage = true;
         }
@@ -209,10 +200,7 @@ exports.Stage = Montage.create(Component, {
         set: function(value) {
             this._userPaddingTop = value;
             this._documentOffsetTop = -value;
-            if(!this._documentRoot) {
-                this._documentRoot = this.application.ninja.currentDocument.documentRoot;
-            }
-            this._documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";
+            this.application.ninja.currentDocument.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";