diff options
| author | Valerio Virgillito | 2012-06-08 12:59:13 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-08 12:59:13 -0700 |
| commit | a50814178be2775892ed999c28041d8e81291e22 (patch) | |
| tree | 309af98cd840d3841be74c32e87c30fa8739ff1e /js/panels/properties.reel/properties.js | |
| parent | 4070475b8da7257eca629be7288bf7a31d5e384e (diff) | |
| parent | d14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff) | |
| download | ninja-a50814178be2775892ed999c28041d8e81291e22.tar.gz | |
Merge branch 'refs/heads/master' into timeline-resizer-fix
Diffstat (limited to 'js/panels/properties.reel/properties.js')
| -rwxr-xr-x | js/panels/properties.reel/properties.js | 4 |
1 files changed, 2 insertions, 2 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 | ||