diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/tools/EyedropperTool.js | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
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) |