diff options
| author | Armen Kesablyan | 2012-06-11 11:04:29 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:04:29 -0700 |
| commit | 0f040acabfb7a4bf3138debec5aff869487ceb11 (patch) | |
| tree | 53eaa8ba54cf23a1c3ea0c8b39377773198c3e19 /js/panels/properties.reel/sections | |
| parent | 7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a (diff) | |
| parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
| download | ninja-0f040acabfb7a4bf3138debec5aff869487ceb11.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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 | } |