aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-07 15:30:13 -0700
committerValerio Virgillito2012-06-07 15:30:13 -0700
commit2e331fc1daba0f6f29191a36cf7647f6f5dc36ee (patch)
tree6a9997c67f581a872bf29ba5da05dfd14ad81dc3 /js/panels/properties.reel/sections
parentb75fe9369f7caec0351d298f7106c8d59572b440 (diff)
parent25d639e6c7dd737f4671011faf07091c86c0e324 (diff)
downloadninja-2e331fc1daba0f6f29191a36cf7647f6f5dc36ee.tar.gz
Merge pull request #282 from mencio/colorchip-fix
fixing the body color chip for non banners templates
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ae408f11..9df16112 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
400 this.controls[aField.id] = obj; 400 this.controls[aField.id] = obj;
401 401
402 // TODO - Hack for now to reference the color select object to unregister color chips 402 // TODO - Hack for now to reference the color select object to unregister color chips
403 this.controls["background"] = obj; 403 this.controls["background-color"] = obj;
404 404
405 return obj; 405 return obj;
406 } 406 }