diff options
| author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
| commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
| tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/panels/properties.reel/properties.js | |
| parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
| parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
| download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz | |
Merge branch 'master' into brushtool
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 | ||