codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-01-05 20:22:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-08-02 14:25:30 -07:00
commit d52c0a2846
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/SuperModel.coffee
View file

@ -309,7 +309,7 @@ class ModelResource extends Resource
console.log "Didn't load model in #{timeToWait}ms (attempt ##{@loadsAttempted}), trying again: ", this console.log "Didn't load model in #{timeToWait}ms (attempt ##{@loadsAttempted}), trying again: ", this
@fetchModel() @fetchModel()
@listenTo @model, 'error', (levelComponent, request) -> @listenTo @model, 'error', (levelComponent, request) ->
if request.status isnt 504 if request.status not in [408, 504, 522, 524]
clearTimeout(@timeoutID) clearTimeout(@timeoutID)
clearTimeout(@timeoutID) if @timeoutID clearTimeout(@timeoutID) if @timeoutID
@timeoutID = setTimeout(tryLoad, timeToWait) @timeoutID = setTimeout(tryLoad, timeToWait)