diff options
| author | Jon Reid | 2012-06-12 13:32:02 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
| commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
| tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/panels/properties.reel/sections | |
| parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
| parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
| download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | } |