Merge branch 'master' into production

This commit is contained in:
phoenixeliot 2016-08-02 14:25:30 -07:00
commit d52c0a2846

View file

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