diff options
| author | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
| commit | 58e049b68e03abbacde93206d2666361022c0858 (patch) | |
| tree | f1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/components/ui/color-chip.reel | |
| parent | a9050f96d814469f420bcf3630d16d576b62258e (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/ui/color-chip.reel')
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js index 7a7411da..4e64b2e8 100755 --- a/js/components/ui/color-chip.reel/color-chip.js +++ b/js/components/ui/color-chip.reel/color-chip.js | |||
| @@ -56,6 +56,8 @@ var ColorChip = exports.ColorChip = Montage.create(Component, { | |||
| 56 | if(this.hasIcon) { | 56 | if(this.hasIcon) { |
| 57 | var icon = this.iconType || this.mode + "Icon"; | 57 | var icon = this.iconType || this.mode + "Icon"; |
| 58 | this.application.ninja.colorController.addButton(icon, this.icon); | 58 | this.application.ninja.colorController.addButton(icon, this.icon); |
| 59 | } else { | ||
| 60 | this.icon.style.display = "none"; | ||
| 59 | } | 61 | } |
| 60 | 62 | ||
| 61 | this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset}; | 63 | this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset}; |