diff options
| author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
| commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
| tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/panels/properties.reel/sections | |
| parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
| parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
| download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/properties.reel/sections')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 |
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 | } |