diff options
author | Valerio Virgillito | 2012-06-21 16:26:52 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-21 16:26:52 -0700 |
commit | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (patch) | |
tree | 564528119093e4e3408ccf180d55ac3d5e413813 /js/stage | |
parent | c411f76d89c543837548085ff468fee0fb4f2ff9 (diff) | |
parent | 47be0919aa271e97fd7ca86e65cdf93aeee2bf81 (diff) | |
download | ninja-2af33f19de48bb8fe269c51ceddd1bc1f591651f.tar.gz |
Merge pull request #320 from ananyasen/cut-copy-paste
copy cut paste - project phase 1 check in
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)); |