diff options
| author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
| commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
| tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/panels/properties.reel/sections | |
| parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
| parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
| download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz | |
Merge branch 'master' into brushtool
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 | } |