diff options
author | Jon Reid | 2012-06-12 13:32:02 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-12 13:32:02 -0700 |
commit | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (patch) | |
tree | e4d070fe1e67fea38cc0343eda297572da717efa /js/panels/properties.reel/properties.js | |
parent | 8e98ce012f55576ddb979969a3a1d834301af0c7 (diff) | |
parent | 7887aafbff794e9c5f918c667e73a8386c38cf02 (diff) | |
download | ninja-8c55dfcb0a669eef0a3bb406b70868078ef09810.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 d3362474..700b93f3 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -244,8 +244,8 @@ exports.Properties = Montage.create(Component, { | |||
244 | controls = this.customSections[n].content.controls; | 244 | controls = this.customSections[n].content.controls; |
245 | if(controls["colorSelect"]) { | 245 | if(controls["colorSelect"]) { |
246 | controls["colorSelect"].destroy(); | 246 | controls["colorSelect"].destroy(); |
247 | } else if(controls["background"]) { | 247 | } else if(controls["background-color"]) { |
248 | controls["background"].destroy(); | 248 | controls["background-color"].destroy(); |
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||