aboutsummaryrefslogtreecommitdiff
path: root/js/models/color-model.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-12 12:00:07 -0700
committerNivesh Rajbhandari2012-03-12 12:00:07 -0700
commit2c6339a9191033c937c2bac3e181c2bc380f4c48 (patch)
treef5b6b66c578d77f3db3373ff9521519d107fc33a /js/models/color-model.js
parente44238821c6b19a4b2259d26e14847b9995338f2 (diff)
downloadninja-2c6339a9191033c937c2bac3e181c2bc380f4c48.tar.gz
Fixed element mediator, PI, and eye-dropper to handle different borders sides and gradients.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/models/color-model.js')
-rwxr-xr-xjs/models/color-model.js3
1 files changed, 3 insertions, 0 deletions
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, {
574 temp = this.hslToRgb(color.h/360, color.s/100, color.l/100); 574 temp = this.hslToRgb(color.h/360, color.s/100, color.l/100);
575 } else if (color.r !== undefined) { 575 } else if (color.r !== undefined) {
576 temp = color; 576 temp = color;
577 } else if (color.gradientMode) {
578 // TODO - Need to handle gradients at some point
579 return null;
577 } 580 }
578 temp.a = color.a; 581 temp.a = color.a;
579 } 582 }