Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into document-bindings-fix

Conflicts:
	js/stage/stage-deps.js
	js/stage/stage.reel/stage.js

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

1 files changed, 40 insertions, 8 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index da5a4f76..4505ff66 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -97,6 +97,12 @@ exports.Stage = Montage.create(Component, {
     _layoutCanvas: { value: null },
     layoutCanvas: { get: function() { return this._layoutCanvas; } },
 
+    _gridCanvas: { value: null },
+    gridCanvas: { get: function() { return this._gridCanvas; } },
+
+    _gridContext: { value: null },
+    gridContext: { get: function() { return this._gridContext; } },
+
     _drawingCanvas: { value: null },
     drawingCanvas: { get: function() { return this._drawingCanvas; } },
 
@@ -183,7 +189,7 @@ exports.Stage = Montage.create(Component, {
                 this.initWithDocument(false);
             }
         }
-    },
+        },
 
     _userPaddingLeft: { value: 0 },
     _userPaddingTop: { value: 0 },
@@ -194,7 +200,7 @@ exports.Stage = Montage.create(Component, {
             this._userPaddingLeft = value;
             this._documentOffsetLeft = -value;
             this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-left"] = -value + "px";
-            this.userContentLeft = this._documentOffsetLeft;
+            this.userContentLeft = this._documentOffsetLeft - this._scrollLeft;
             this.updatedStage = true;
         }
     },
@@ -205,7 +211,7 @@ exports.Stage = Montage.create(Component, {
             this._userPaddingTop = value;
             this._documentOffsetTop = -value;
             this.application.ninja.currentDocument.model.documentRoot.ownerDocument.getElementsByTagName("HTML")[0].style["padding-top"] = -value + "px";
-            this.userContentTop = this._documentOffsetTop;
+            this.userContentTop = this._documentOffsetTop - this._scrollTop;
             this.updatedStage = true;
         }
     },
@@ -214,11 +220,14 @@ exports.Stage = Montage.create(Component, {
         value: function() {
             if(this.resizeCanvases) {
                 // TODO GET THE SCROLL SIZE FROM THE CSS -- 11 px
-                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this.element.offsetWidth - 11 ;
-                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this.element.offsetHeight - 11;// - 26 - 26;
+                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
+                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;// - 26 - 26;
 
                 // Hack for now until a full component
                 this.layout.draw();
+                if(this.application.ninja.currentDocument) {
+                    this.layout.draw3DInfo(true);
+                }
             } else if(this.updatedStage) {
                 this.layout.draw();
                 this.layout.draw3DInfo(true);
@@ -238,6 +247,7 @@ exports.Stage = Montage.create(Component, {
 
             this._context = this._canvas.getContext("2d");
             this._drawingContext= this._drawingCanvas.getContext("2d");
+            this._gridContext= this._gridCanvas.getContext("2d");
 
             // Setup event listeners
             this._drawingCanvas.addEventListener("mousedown", this, false);
@@ -281,8 +291,8 @@ exports.Stage = Montage.create(Component, {
             var designView = this.application.ninja.currentDocument.model.views.design;
 
             // Recalculate the canvas sizes because of splitter resizing
-            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this.element.offsetWidth - 11 ;
-            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this.element.offsetHeight - 11;
+            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
+            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;
 
             designView.iframe.contentWindow.addEventListener("scroll", this, false);
 
@@ -300,6 +310,8 @@ exports.Stage = Montage.create(Component, {
             this._scrollLeft = 0;
             this._scrollTop = 0;
 
+            this.initialize3DOnOpenDocument();
+
             if(designView._template) {
                 var initialLeft = parseInt((this.canvas.width - designView._template.size.width)/2);
                 var initialTop = parseInt((this.canvas.height - designView._template.size.height)/2);
@@ -521,11 +533,12 @@ exports.Stage = Montage.create(Component, {
                 this._canvas.style.visibility = "hidden";
                 this._layoutCanvas.style.visibility = "hidden";
                 this._drawingCanvas.style.visibility = "hidden";
+                this._gridCanvas.style.visibility = "hidden";
             } else {
                 this._canvas.style.visibility = "visible";
                 this._layoutCanvas.style.visibility = "visible";
                 this._drawingCanvas.style.visibility = "visible";
-
+                this._gridCanvas.style.visibility = "visible";
             }
         }
     },
@@ -562,10 +575,17 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    clearGridCanvas: {
+        value: function() {
+            this._gridContext.clearRect(0, 0, this._gridCanvas.width, this._gridCanvas.height);
+        }
+    },
+
     clearAllCanvas: {
         value: function() {
             this._drawingContext.clearRect(0, 0, this._drawingCanvas.width, this._drawingCanvas.height);
             this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
+            this._gridContext.clearRect(0, 0, this._gridCanvas.width, this._gridCanvas.height);
             this.layout.clearCanvas();
         }
     },
@@ -1063,6 +1083,18 @@ exports.Stage = Montage.create(Component, {
             this.application.ninja.toolsSplitter.restore();
             this.application.ninja.optionsSplitter.restore();
         }
+    },
+
+    initialize3DOnOpenDocument: {
+        value: function() {
+
+            workingPlane = [0,0,1,0];
+
+            this.snapManager._isCacheInvalid = true;
+            this.snapManager.setupDragPlaneFromPlane (workingPlane);
+
+            this.drawUtils.initializeFromDocument();
+        }
     }
 
 });
\ No newline at end of file