From e065244ac75d1d0f25fd5c75cb58e714a13fe16b Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 14 Mar 2012 08:59:17 -0700 Subject: Squashed commit of the following: merge master into timeline Signed-off-by: Jonathan Duran --- js/models/color-model.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/models') diff --git a/js/models/color-model.js b/js/models/color-model.js index 2c86422f..4189fbef 100755 --- a/js/models/color-model.js +++ b/js/models/color-model.js @@ -574,6 +574,9 @@ exports.ColorModel = Montage.create(Component, { temp = this.hslToRgb(color.h/360, color.s/100, color.l/100); } else if (color.r !== undefined) { temp = color; + } else if (color.gradientMode) { + // TODO - Need to handle gradients at some point + return null; } temp.a = color.a; } -- cgit v1.2.3