Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-01-16 09:21:52 -08:00
commit 5fd1a937bb
2 changed files with 2 additions and 2 deletions

View file

@ -11,7 +11,7 @@ block content
p.lead Want to hire expert CodeCombat players?
p
| CodeCombat doesn't just have beginners. We also have expert software developers who play our
| CodeCombat doesn't just have beginners. We also have expert software developers who play our
a(href="http://blog.codecombat.com/beat-this-level-get-a-programming-job") developer challenge levels
| . If your company is seeking technical talent, then we'd be happy to help place candidates with you.

View file

@ -40,7 +40,7 @@ module.exports = class ThangAvatarView extends View
@$el.toggleClass 'selected', Boolean(selected)
onProblemsUpdated: (e) ->
return unless @thang.id of e.spell.thangs
return unless @thang?.id of e.spell.thangs
myProblems = []
for thangID, spellThang of e.spell.thangs when thangID is @thang.id
#aether = if e.isCast and spellThang.castAether then spellThang.castAether else spellThang.aether