codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-03-09 09:51:20 -07:00
commit 64077bd3fa
1 changed files with 1 additions and 1 deletions

2
app/views/play/CampaignView.coffee
View file

@ -573,7 +573,7 @@ module.exports = class CampaignView extends RootView
onRecordSync = -> onRecordSync = ->
return if @destroyed return if @destroyed
@userPollsRecord.url = -> '/db/user.polls.record/' + @id @userPollsRecord.url = -> '/db/user.polls.record/' + @id
lastVoted = new Date @userPollsRecord.get('changed') lastVoted = new Date(@userPollsRecord.get('changed') or 0)
interval = new Date() - lastVoted interval = new Date() - lastVoted
if interval > 22 * 60 * 60 * 1000 # Wait almost a day before showing the next poll if interval > 22 * 60 * 60 * 1000 # Wait almost a day before showing the next poll
@loadPoll() @loadPoll()