aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-25 11:11:33 -0700
committerArmen Kesablyan2012-06-25 11:11:33 -0700
commit35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (patch)
tree337fd4e9ca5c68fd15d3f56a83ff42aa8eade670 /js/stage/stage.reel
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
parentd24243239f38704580bb3561a3959688b171809b (diff)
downloadninja-35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-xjs/stage/stage.reel/stage.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index fce73882..f4de3070 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -705,7 +705,7 @@ exports.Stage = Montage.create(Component, {
705 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); 705 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop));
706 element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); 706 element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop);
707 707
708 if(!element) debugger; 708// if(!element) debugger;
709 // workaround Chrome 3d bug 709 // workaround Chrome 3d bug
710 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { 710 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) {
711 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); 711 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));