diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/components/ui/color-chip.reel/color-chip.js | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/ui/color-chip.reel/color-chip.js')
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 6 |
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; |