diff options
author | Ananya Sen | 2012-05-22 17:59:03 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-22 17:59:03 -0700 |
commit | ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b (patch) | |
tree | 9e27878524eb2781a7f3094de0d5ed3f84624980 /js/panels/properties.reel/sections | |
parent | ee54342b5f4fdd41c46543d6402e649e4b3d57cb (diff) | |
parent | a341522e3603c18ab3b93defa894e3be702dd0f4 (diff) | |
download | ninja-ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b.tar.gz |
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
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 49b4414e..b1fd910d 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["stageBackground"] = obj; | 403 | this.controls["background"] = obj; |
404 | 404 | ||
405 | return obj; | 405 | return obj; |
406 | } | 406 | } |