diff options
author | Valerio Virgillito | 2012-07-20 15:44:57 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-20 15:44:57 -0700 |
commit | d0526d124f2bbc1c28912d2d3de925d175f5e2d5 (patch) | |
tree | 9010ff97310f209fe35fef06899056cab8169282 /js/stage/stage.reel | |
parent | c6965b0329672daeffbb3f76746821ab72ad03c8 (diff) | |
parent | d7f5d6ffb39d55f2d4f4f366421571826df1e8bb (diff) | |
download | ninja-d0526d124f2bbc1c28912d2d3de925d175f5e2d5.tar.gz |
Merge branch 'Fixes_071' of https://github.com/mqg734/ninja into v0.7.1
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 4 |
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)); |