diff options
author | Valerio Virgillito | 2012-06-07 15:30:13 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-07 15:30:13 -0700 |
commit | 2e331fc1daba0f6f29191a36cf7647f6f5dc36ee (patch) | |
tree | 6a9997c67f581a872bf29ba5da05dfd14ad81dc3 /js/panels | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
parent | 25d639e6c7dd737f4671011faf07091c86c0e324 (diff) | |
download | ninja-2e331fc1daba0f6f29191a36cf7647f6f5dc36ee.tar.gz |
Merge pull request #282 from mencio/colorchip-fix
fixing the body color chip for non banners templates
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 4 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 934a3851..cc99ca6c 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -243,8 +243,8 @@ exports.Properties = Montage.create(Component, { | |||
243 | controls = this.customSections[n].content.controls; | 243 | controls = this.customSections[n].content.controls; |
244 | if(controls["colorSelect"]) { | 244 | if(controls["colorSelect"]) { |
245 | controls["colorSelect"].destroy(); | 245 | controls["colorSelect"].destroy(); |
246 | } else if(controls["background"]) { | 246 | } else if(controls["background-color"]) { |
247 | controls["background"].destroy(); | 247 | controls["background-color"].destroy(); |
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
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 | } |