diff options
author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/tools/EyedropperTool.js | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
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) |