aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-08 17:09:55 -0700
committerAnanya Sen2012-06-08 17:09:55 -0700
commit19d9da2ae655f0b531aa0e348a15bcf9d673a776 (patch)
tree4ec453ac47c77b9d5872e0b78a1b17971a95ce3d /js/panels/properties.reel/sections/custom.reel
parent113ed223e9848d9838e574c67720d524653e704c (diff)
parentbad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff)
downloadninja-19d9da2ae655f0b531aa0e348a15bcf9d673a776.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
-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 }