aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.js
diff options
context:
space:
mode:
authorJonathan Duran2012-07-23 08:25:56 -0700
committerJonathan Duran2012-07-23 08:25:56 -0700
commite7268388a99722dd7bb64506893538fd0ee96a71 (patch)
tree9e0f960030f1625f730bbd60ca79ce449a788df0 /js/stage/stage.reel/stage.js
parent3487c690d526534f27578acdffe1a45f2526cbf6 (diff)
parent2b05717e49bafc4b401441d9a55153b9e4ae7e43 (diff)
downloadninja-e7268388a99722dd7bb64506893538fd0ee96a71.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-xjs/stage/stage.reel/stage.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index b7235d19..817220d4 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -894,7 +894,9 @@ exports.Stage = Montage.create(Component, {
894 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); 894 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop));
895 element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); 895 element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop);
896 896
897// if(!element) debugger; 897 if(!element) {
898 return this.currentDocument.model.domContainer;
899 }
898 // workaround Chrome 3d bug 900 // workaround Chrome 3d bug
899 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { 901 if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) {
900 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); 902 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));