Merge pull request #19 from ananyasen/FileIO

FileIO branch pull request

4 files changed, 58 insertions, 20 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index a94dd10c..de4c67c1 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -98,6 +98,11 @@ exports.Layout = Montage.create(Component, {
 
     handleSelectionChange: {
         value: function(event) {
+
+            if(this.application.ninja.documentController.activeDocument === null){
+                return;
+            }
+
             // Make an array copy of the line node list which is not an array like object
             this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
 
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index d46e2b81..16f2c652 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -23,6 +23,10 @@ exports.StageDeps = Montage.create(Component, {
         value: snapManager
     },
 
+    drawUtils: {
+        value: drawUtils
+    },
+
     currentStage: {
         value: null
     },
@@ -129,19 +133,47 @@ exports.StageDeps = Montage.create(Component, {
             viewUtils.setRootElement(this.currentStage.parentNode);
             viewUtils.setStageElement(this.currentStage);
 
-            drawUtils.setDrawingSurfaceElement(this.stage.canvas);
-            drawUtils.setSourceSpaceElement( this.currentStage );
-            drawUtils.setWorkingPlane( workingPlane );
             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();
+        }
+    },
+
+    reinitializeForSwitchDocument: {
+        value: function() {
+
+            workingPlane = Vector.create( [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;
 
+            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 dc9980f0..91047e51 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -118,14 +118,9 @@ exports.StageView = Montage.create(Component, {
         }
     },
 
-
-
+    //called for switching between html documents
     switchDocument:{
         value: function(doc){
-            //save editor cursor position
-            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
-                this.application.ninja.documentController.activeDocument.hline = this.application.ninja.documentController.activeDocument.editor.getCursor(true);
-            }
             this.application.ninja.documentController._hideCurrentDocument();
 
             this.application.ninja.documentController.activeDocument = doc;
@@ -133,22 +128,26 @@ 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();
 
-            var documentController = this.application.ninja.documentController;
-
-            //restore editor cursor position
+            //focus current document
             if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
-                this.application.ninja.documentController.activeDocument.editor.setCursor(this.application.ninja.documentController.activeDocument.hline);
                 document.getElementById("codeMirror_"+this.application.ninja.documentController.activeDocument.uuid).getElementsByClassName("CodeMirror")[0].focus();
             }
 
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
                 this.application.ninja.stage._scrollFlag = true; // TODO HACK to prevent type error on Hide/Show Iframe
-               this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument;
+                this.application.ninja.currentDocument = this.application.ninja.documentController.activeDocument;
+
+                //reinitialize draw-util, snapmanager and view-util
+                this.application.ninja.stage.stageDeps.reinitializeForSwitchDocument();
+
+                //this.application.ninja.stage.layout.reinitializeForSwitchDocument();
 
                 // TODO dispatch event here
     //                appDelegateModule.MyAppDelegate.onSetActiveDocument();
             }
 
+            NJevent("switchDocument");
+
         }
     },
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 8d664f25..9784f14d 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -37,6 +37,10 @@ exports.Stage = Montage.create(Component, {
                 get: function()  {  return this.stageDeps.snapManager;  }
         },
 
+    drawUtils: {
+        get: function()  {  return this.stageDeps.drawUtils;  }
+    },
+
     resizeCanvases: {
         get: function() {
             return this._resizeCanvases;
@@ -144,12 +148,12 @@ exports.Stage = Montage.create(Component, {
 
     userContentLeft: {
         get: function() { return this._userContentLeft; },
-        set: function(value) { this._userContentLeft = value; }
+        set: function(value) { this._userContentLeft = value;}
     },
 
     userContentTop: {
         get: function() { return this._userContentTop; },
-        set: function(value) { this._userContentTop = value; }
+        set: function(value) { this._userContentTop = value;}
     },
 
     userContentBorder: {
@@ -435,12 +439,11 @@ exports.Stage = Montage.create(Component, {
      */
     handleScroll: {
         value: function() {
-
             this._scrollLeft = this._iframeContainer.scrollLeft;
             this._scrollTop = this._iframeContainer.scrollTop;
 
-            this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
-            this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
+            this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
+            this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
 
             // Need to clear the snap cache and set up the drag plane
             //snapManager.setupDragPlaneFromPlane( workingPlane );
@@ -448,7 +451,6 @@ exports.Stage = Montage.create(Component, {
 
             this.needsDraw = true;
             this.layout.draw();
-
             //this._toolsList.action("DrawHandles");
 
         }