codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-23 19:32:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2015-01-12 14:43:53 -08:00
commit 38948137b9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/play/level/modal/HeroVictoryModal.coffee
View file

@ -81,21 +81,25 @@ module.exports = class HeroVictoryModal extends ModalView
@newEarnedAchievements.push ea @newEarnedAchievements.push ea
@listenToOnce ea, 'sync', -> @listenToOnce ea, 'sync', ->
if _.all((ea.id for ea in @newEarnedAchievements)) if _.all((ea.id for ea in @newEarnedAchievements))
@newEarnedAchievementsResource.markLoaded()
@listenToOnce me, 'sync', -> @listenToOnce me, 'sync', ->
@readyToContinue = true @readyToContinue = true
@updateSavingProgressStatus() @updateSavingProgressStatus()
me.fetch cache: false unless me.loading me.fetch cache: false unless me.loading
@readyToContinue = true if not @achievements.models.length @readyToContinue = true if not @achievements.models.length
# have to use a something resource because addModelResource doesn't handle models being upserted/fetched via POST like we're doing here
@newEarnedAchievementsResource = @supermodel.addSomethingResource('earned achievements') if @newEarnedAchievements.length
getRenderData: -> getRenderData: ->
c = super() c = super()
c.levelName = utils.i18n @level.attributes, 'name' c.levelName = utils.i18n @level.attributes, 'name'
earnedAchievementMap = _.indexBy(@earnedAchievements?.models or [], (ea) -> ea.get('achievement')) earnedAchievementMap = _.indexBy(@newEarnedAchievements or [], (ea) -> ea.get('achievement'))
for achievement in @achievements.models for achievement in @achievements.models
earnedAchievement = earnedAchievementMap[achievement.id] earnedAchievement = earnedAchievementMap[achievement.id]
if earnedAchievement if earnedAchievement
achievement.completedAWhileAgo = new Date() - Date.parse(earnedAchievement.get('created')) > 30 * 1000 achievement.completedAWhileAgo = new Date().getTime() - Date.parse(earnedAchievement.get('created')) > 30 * 1000
achievement.worth = achievement.get 'worth', true achievement.worth = achievement.get 'worth', true
achievement.gems = achievement.get('rewards')?.gems achievement.gems = achievement.get('rewards')?.gems
c.achievements = @achievements.models.slice() c.achievements = @achievements.models.slice()