diff options
| author | Nivesh Rajbhandari | 2012-06-07 15:32:05 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-07 15:32:05 -0700 |
| commit | 4a4a4498b0c55111ff49d1dc939fe22cbe31e975 (patch) | |
| tree | 5c11b7463432f887751713d693fd6d6c9024561c /js/panels/properties.reel/properties.js | |
| parent | 21098080e7716379ceefefca5f3cc1850ac78fa7 (diff) | |
| parent | 2e331fc1daba0f6f29191a36cf7647f6f5dc36ee (diff) | |
| download | ninja-4a4a4498b0c55111ff49d1dc939fe22cbe31e975.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into BodyPI
Conflicts:
js/controllers/elements/body-controller.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 | ||