aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorhwc4872012-06-29 13:01:02 -0700
committerhwc4872012-06-29 13:01:02 -0700
commit44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05 (patch)
tree77ec7650cbc397c1792254529b0430cd691fad08 /js/components/ui
parent230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (diff)
parentecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff)
downloadninja-44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index a684d0db..dd786d15 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -82,7 +82,11 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
82 // This is a single chip - Not related to the color panel -- Set the initial color if found 82 // This is a single chip - Not related to the color panel -- Set the initial color if found
83 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; 83 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
84 84
85 if(this.color) { 85 if(this.color && this.color.color) {
86 var g = this.color.color;
87 g.wasSetByCode = true;
88 this.chipBtn.color(this.color.mode, g);
89 } else if (this.color) {
86 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); 90 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
87 mode = colorObj.mode; 91 mode = colorObj.mode;
88 r = colorObj.value.r; 92 r = colorObj.value.r;