diff options
author | Nivesh Rajbhandari | 2012-03-26 12:09:47 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-26 12:09:47 -0700 |
commit | 21ed09eedee336e69ce2e0f9fd254eb989227adf (patch) | |
tree | 2f7b91c8dc18b4ac157f25fd9aac8555dc7f2f7d /js/tools | |
parent | 53d83f9515c1d6edd35bf16a94e022730ccafbe9 (diff) | |
download | ninja-21ed09eedee336e69ce2e0f9fd254eb989227adf.tar.gz |
Handle no-color/null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/EyedropperTool.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js index 6d6937e3..7458a9e8 100755 --- a/js/tools/EyedropperTool.js +++ b/js/tools/EyedropperTool.js | |||
@@ -148,7 +148,11 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
148 | c = this._getColorFromElement(obj, event); | 148 | c = this._getColorFromElement(obj, event); |
149 | } | 149 | } |
150 | 150 | ||
151 | if(typeof(c) === "string") | 151 | if(!c) |
152 | { | ||
153 | color = null; | ||
154 | } | ||
155 | else if(typeof(c) === "string") | ||
152 | { | 156 | { |
153 | color = this.application.ninja.colorController.getColorObjFromCss(c); | 157 | color = this.application.ninja.colorController.getColorObjFromCss(c); |
154 | } | 158 | } |