Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-03-09 09:51:20 -07:00
commit 64077bd3fa

View file

@ -573,7 +573,7 @@ module.exports = class CampaignView extends RootView
onRecordSync = ->
return if @destroyed
@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
if interval > 22 * 60 * 60 * 1000 # Wait almost a day before showing the next poll
@loadPoll()