diff options
author | Nivesh Rajbhandari | 2012-01-31 17:30:53 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-01-31 17:30:53 -0800 |
commit | affafafc4db16e5f918c74dfc919025d4c563cc6 (patch) | |
tree | bae583f698d4993c52b31432b598bf4254f59bb0 /js/models | |
parent | ff700e7921b8e30b89e963c48888c8296ed16f52 (diff) | |
download | ninja-affafafc4db16e5f918c74dfc919025d4c563cc6.tar.gz |
Updated color code to handle shapes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/models')
-rw-r--r-- | js/models/color-model.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/models/color-model.js b/js/models/color-model.js index 7e5fee1f..b06281f8 100644 --- a/js/models/color-model.js +++ b/js/models/color-model.js | |||
@@ -415,8 +415,10 @@ exports.ColorModel = Montage.create(Component, { | |||
415 | colorEvent.alpha = this.alpha.value; | 415 | colorEvent.alpha = this.alpha.value; |
416 | if (this.hsl) | 416 | if (this.hsl) |
417 | colorEvent.hsla = {h: this.hsl.h, s: this.hsl.s, l: this.hsl.l, a: this.alpha.value, css: 'hsla('+this.hsl.h+', '+this.hsl.s+'%, '+this.hsl.l+'%, '+this.alpha.value+')'}; | 417 | colorEvent.hsla = {h: this.hsl.h, s: this.hsl.s, l: this.hsl.l, a: this.alpha.value, css: 'hsla('+this.hsl.h+', '+this.hsl.s+'%, '+this.hsl.l+'%, '+this.alpha.value+')'}; |
418 | if (this.rgb) | 418 | if (this.rgb) { |
419 | colorEvent.rgba = {r: this.rgb.r, g: this.rgb.g, b: this.rgb.b, a: this.alpha.value, css: 'rgba('+ this.rgb.r +', '+this.rgb.g+', '+this.rgb.b+', '+this.alpha.value+')'}; | 419 | colorEvent.rgba = {r: this.rgb.r, g: this.rgb.g, b: this.rgb.b, a: this.alpha.value, css: 'rgba('+ this.rgb.r +', '+this.rgb.g+', '+this.rgb.b+', '+this.alpha.value+')'}; |
420 | colorEvent.webGlColor = [this.rgb.r/255, this.rgb.g/255, this.rgb.b/255, this.alpha.value]; | ||
421 | } | ||
420 | if (this.hex) | 422 | if (this.hex) |
421 | colorEvent.hex = this.hex; | 423 | colorEvent.hex = this.hex; |
422 | //Standard values that apply to any event | 424 | //Standard values that apply to any event |