aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-26 12:09:47 -0700
committerNivesh Rajbhandari2012-03-26 12:09:47 -0700
commit21ed09eedee336e69ce2e0f9fd254eb989227adf (patch)
tree2f7b91c8dc18b4ac157f25fd9aac8555dc7f2f7d
parent53d83f9515c1d6edd35bf16a94e022730ccafbe9 (diff)
downloadninja-21ed09eedee336e69ce2e0f9fd254eb989227adf.tar.gz
Handle no-color/null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/tools/EyedropperTool.js6
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 }