diff options
| author | Nivesh Rajbhandari | 2012-02-24 11:56:42 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-24 13:28:14 -0800 |
| commit | 818ec3b66d4394d80fcffbfcee82b40fe1477319 (patch) | |
| tree | 567c0be284b99634556204e8f47f4845ddf7d5ad /js/stage | |
| parent | 8dd707776024ff067064e7841810d04f2f7a1df7 (diff) | |
| download | ninja-818ec3b66d4394d80fcffbfcee82b40fe1477319.tar.gz | |
Distinguish between border top/right/bottom/left colors. Also, fall back to snapping routine when selecting only if the active tool allows snapping.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 641ac247..922abc33 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(this.application.ninja.currentDocument.inExclusion(elt) !== -1) | 522 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) |
| 523 | { | 523 | { |
| 524 | return this._getElementUsingSnapping(point); | 524 | return this._getElementUsingSnapping(point); |
| 525 | } else { | 525 | } else { |