codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 01:55:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix config refactoring

Browse source
This commit is contained in:
Nick Winter 2015-12-23 12:08:07 -08:00
parent d56ba6e1e8
commit 55f7b4a115
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/Level.coffee
View file

@ -120,7 +120,7 @@ module.exports = class Level extends CocoModel
copy = $.extend true, {}, placeholderConfig copy = $.extend true, {}, placeholderConfig
programmableProperties = config?.programmableProperties ? [] programmableProperties = config?.programmableProperties ? []
copy.programmableProperties = _.union programmableProperties, copy.programmableProperties ? [] copy.programmableProperties = _.union programmableProperties, copy.programmableProperties ? []
config = _.merge copy, config levelThangComponent.config = config = _.merge copy, config
else if placeholderConfig.extraHUDProperties else if placeholderConfig.extraHUDProperties
config.extraHUDProperties = _.union(config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties) config.extraHUDProperties = _.union(config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
else if placeholderConfig.voiceRange # Pull in voiceRange else if placeholderConfig.voiceRange # Pull in voiceRange