diff options
author | hwc487 | 2012-02-22 10:59:02 -0800 |
---|---|---|
committer | hwc487 | 2012-02-22 10:59:02 -0800 |
commit | f5a9123ba661fe83442a873a05bc6a86edc396f8 (patch) | |
tree | 484a03dd1cc89429a434fba0d63d0500f5945851 /js/stage | |
parent | 1a72686c9b915c488f9b430995787d2176671561 (diff) | |
parent | 50bb05efbafc9a80f069dfde32988e5cd6826865 (diff) | |
download | ninja-f5a9123ba661fe83442a873a05bc6a86edc396f8.tar.gz |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration
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 79a57f22..641ac247 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -519,7 +519,7 @@ exports.Stage = Montage.create(Component, { | |||
519 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 519 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
520 | 520 | ||
521 | // workaround Chrome 3d bug | 521 | // workaround Chrome 3d bug |
522 | if(elt === this._viewport) | 522 | if(this.application.ninja.currentDocument.inExclusion(elt) !== -1) |
523 | { | 523 | { |
524 | return this._getElementUsingSnapping(point); | 524 | return this._getElementUsingSnapping(point); |
525 | } else { | 525 | } else { |