diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/panels/properties.reel/sections/custom.reel | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel')
| -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 | } |