aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-01 15:26:37 -0700
committerJose Antonio Marquez2012-05-01 15:26:37 -0700
commit4ba680a7e9168d0f505a81e42a287dfbc54b4d7d (patch)
tree861610e3676bdcfd5d1e54ce268fdceb66016238 /js/stage/stage.reel/stage.js
parent7812925f6864a6f3a01e4a76924dc5c71706ff37 (diff)
downloadninja-4ba680a7e9168d0f505a81e42a287dfbc54b4d7d.tar.gz
Preliminary IO to new DOM view
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-xjs/stage/stage.reel/stage.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 515165bf..2e49fc04 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -264,7 +264,7 @@ exports.Stage = Montage.create(Component, {
264 this._userContentLeft = 0; 264 this._userContentLeft = 0;
265 this._userContentTop = 0; 265 this._userContentTop = 0;
266 266
267 this.application.ninja.currentDocument._window.addEventListener("scroll", this, false); 267 //this.application.ninja.currentDocument._window.addEventListener("scroll", this, false);
268 } 268 }
269 269
270 270
@@ -543,7 +543,7 @@ exports.Stage = Montage.create(Component, {
543 var point, element; 543 var point, element;
544 544
545 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); 545 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));
546 element = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); 546 element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop);
547 547
548 // workaround Chrome 3d bug 548 // workaround Chrome 3d bug
549 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) { 549 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) {