diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/tools/EyedropperTool.js | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/tools/EyedropperTool.js')
| -rwxr-xr-x | js/tools/EyedropperTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js index d627f03b..346975b2 100755 --- a/js/tools/EyedropperTool.js +++ b/js/tools/EyedropperTool.js | |||
| @@ -104,7 +104,7 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
| 104 | value : function (event) { | 104 | value : function (event) { |
| 105 | var c, | 105 | var c, |
| 106 | color, | 106 | color, |
| 107 | obj = this.application.ninja.stage.GetElement(event); | 107 | obj = this.application.ninja.stage.getElement(event); |
| 108 | if (obj) | 108 | if (obj) |
| 109 | { | 109 | { |
| 110 | if(this.application.ninja.currentDocument.inExclusion(obj) !== -1) | 110 | if(this.application.ninja.currentDocument.inExclusion(obj) !== -1) |