diff options
| author | Valerio Virgillito | 2012-06-08 12:59:13 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-08 12:59:13 -0700 |
| commit | a50814178be2775892ed999c28041d8e81291e22 (patch) | |
| tree | 309af98cd840d3841be74c32e87c30fa8739ff1e /js/panels/properties.reel/sections | |
| parent | 4070475b8da7257eca629be7288bf7a31d5e384e (diff) | |
| parent | d14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff) | |
| download | ninja-a50814178be2775892ed999c28041d8e81291e22.tar.gz | |
Merge branch 'refs/heads/master' into timeline-resizer-fix
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 | } |