diff options
author | Nivesh Rajbhandari | 2012-03-23 10:51:26 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-23 10:51:26 -0700 |
commit | 1b7e627ae290dacec3a242445f3e6c5de302626a (patch) | |
tree | 04e23082c40a01a7686be92c296d8804cfa67e2f /js/components/ui/color-chip.reel | |
parent | 636014cf5d824909993d7dc3510fbe6ce2fc72f1 (diff) | |
download | ninja-1b7e627ae290dacec3a242445f3e6c5de302626a.tar.gz |
Tweaking some styles in the materials popup.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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}; |