diff options
| author | Jon Reid | 2012-04-10 14:52:23 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
| commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
| tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/components/ui/color-chip.reel | |
| parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
| parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
| download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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}; |