diff options
author | hwc487 | 2012-04-13 11:52:13 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 11:52:13 -0700 |
commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/components/ui/color-chip.reel | |
parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
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}; |