Merge pull request #264 from mencio/document-bindings-fix

Document bindings fix - Changing the documents architecture to use bindings instead of events

3 files changed, 42 insertions, 45 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 871b832d..a793b643 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -112,7 +112,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("elementChanging", this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
             this.eventManager.addEventListener("elementReplaced", this, false);
                 }
         },
@@ -126,7 +125,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             //initialize with current document
             this._eltArray = [];
             this._planesArray = [];
-            this.setDrawingSurfaceElement(stage.canvas);
+            this.setDrawingSurfaceElement(stage.gridCanvas);
             this.setSourceSpaceElement( this.application.ninja.currentDocument.model.documentRoot);
             this.setWorkingPlane( [0,0,1,0] );
 
@@ -164,15 +163,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument:{
-        value: function() {
-            if(this.application.ninja.documentController._documents.length === 0){
-                this._eltArray.length = 0;
-                this._planesArray.length = 0;
-            }
-        }
-    },
-
     handleElementAdded: {
         value: function(event) {
             var elements = event.detail;
@@ -276,8 +266,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     stage = this.application.ninja.stage,
                     minLeft = stage.userPaddingLeft,
                     minTop = stage.userPaddingTop,
-                    docLeft = stage.documentOffsetLeft,
-                    docTop = stage.documentOffsetTop,
+                    docLeft = stage.userContentLeft,
+                    docTop = stage.userContentTop,
                     l,
                     t,
                     plane,
@@ -307,7 +297,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 }
 
                 if(!changed) {
-                    stage.layout.draw();
                     this.drawWorkingPlane();
                     this.draw3DCompass();
                 }
@@ -628,11 +617,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         {
                 value: function ()
                 {
+            this.application.ninja.stage.clearGridCanvas();
                         if (!this.isDrawingGrid()) return;
 
                         var saveContext = this.getDrawingSurfaceElement();
-                        //this.setDrawingSurfaceElement(window.stageManager.layoutCanvas);
-                        this.setDrawingSurfaceElement(this.application.ninja.stage.layoutCanvas);
+                        this.setDrawingSurfaceElement(this.application.ninja.stage.gridCanvas);
 
                         // 3 coordinate axes for the plane
                         var zAxis = [this._workingPlane[0], this._workingPlane[1], this._workingPlane[2]];
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 069c6022..e3756f32 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,8 +21,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    drawingCanvas: { value: null, writable: true},
-    
+
+    currentStage: { value: null },
+
         // we keep a stack of working planes to facilitate working on other planes temporarily
         _workingPlaneStack : { value: [], writable: true },
 
@@ -83,14 +84,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetWidth);
+                return parseInt(this.currentStage.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetHeight);
+                return parseInt(this.currentStage.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.application.ninja.currentDocument.model.documentRoot;    }},
+    getStage : { value: function()              {        return this.currentStage;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -2124,7 +2125,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         if (hitRec)
                         {
                                 var saveContext = drawUtils.getDrawingSurfaceElement();
-                                drawUtils.setDrawingSurfaceElement(this.drawingCanvas);
+                                drawUtils.setDrawingSurfaceElement(this.application.ninja.stage.drawingCanvas);
                                 var context = drawUtils.getDrawingContext();
                                 if (context)
                                 {
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a3d09404..5a128408 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -24,6 +24,9 @@ exports.ViewUtils = Montage.create(Component, {
     // keep a stack of viewport objects
     _viewportObjStack: { value: []},
 
+    _rootElement: { value: null},
+    _stageElement: { value: null},
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -36,6 +39,13 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
+    setRootElement: { value: function( elt )            { this._rootElement = elt; } },
+    getRootElement: { value: function ()                { return this._rootElement;        } },
+
+    setStageElement: { value: function( elt )    {  this._stageElement = elt;    } },
+    getStageElement: { value: function () { return this._stageElement; } },
+
+
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -195,7 +205,12 @@ exports.ViewUtils = Montage.create(Component, {
 
     getPerspectiveDistFromElement: {
         value: function( elt ) {
-            return ElementsMediator.getPerspectiveDist(elt);
+            var pDist = ElementsMediator.getPerspectiveDist(elt);
+            if(pDist === "none") {
+                return null;
+            } else {
+                return pDist;
+            }
         }
     },
 
@@ -280,7 +295,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this.application.ninja.currentDocument.model.documentRoot))  return localPt;
+            if ((elt == null) || (elt === this._stageElement))  return localPt;
 
             // get the 3D transformation and 2D offset from the element
             var pt = localPt.slice(0);
@@ -307,7 +322,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this.application.ninja.currentDocument.model.documentRoot)  break;
+                if (parent === this._stageElement)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -339,10 +354,10 @@ exports.ViewUtils = Montage.create(Component, {
 //                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
 //                child = child.offsetParent;
 
-                if (child === this.application.ninja.currentDocument.model.documentRoot)  break;
+