diff options
| author | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-21 16:54:18 -0700 |
| commit | d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch) | |
| tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/stage | |
| parent | bf6bed611714053aabc0d38978bddd62873d04aa (diff) | |
| parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
| download | ninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/stage')
| -rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
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)); |