Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle aborts in Thread Updater similarly.

Browse Source
This commit is contained in:
ccd0 2019-03-24 02:56:24 -07:00
parent 453c721acc
commit 14a7f55e1a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Monitoring/ThreadUpdater.coffee
View File

@ -128,10 +128,10 @@ ThreadUpdater =
$.cb.value.call @ if e $.cb.value.call @ if e
load: -> load: ->
{req} = ThreadUpdater return if @ isnt ThreadUpdater.req # aborted
switch req.status switch @status
when 200 when 200
ThreadUpdater.parse req ThreadUpdater.parse @
if ThreadUpdater.thread.isArchived if ThreadUpdater.thread.isArchived
ThreadUpdater.kill() ThreadUpdater.kill()
else else
@ -151,9 +151,9 @@ ThreadUpdater =
if confirmed if confirmed
ThreadUpdater.kill() ThreadUpdater.kill()
else else
ThreadUpdater.error req ThreadUpdater.error @
else else
ThreadUpdater.error req ThreadUpdater.error @
kill: -> kill: ->
ThreadUpdater.thread.kill() ThreadUpdater.thread.kill()
@ -230,7 +230,9 @@ ThreadUpdater =
update: -> update: ->
clearTimeout ThreadUpdater.timeoutID clearTimeout ThreadUpdater.timeoutID
ThreadUpdater.set 'timer', '...', 'loading' ThreadUpdater.set 'timer', '...', 'loading'
ThreadUpdater.req?.abort() if (oldReq = ThreadUpdater.req)
delete ThreadUpdater.req
oldReq.abort()
ThreadUpdater.req = $.whenModified( ThreadUpdater.req = $.whenModified(
Site.urls.threadJSON({boardID: ThreadUpdater.thread.board.ID, threadID: ThreadUpdater.thread.ID}), Site.urls.threadJSON({boardID: ThreadUpdater.thread.board.ID, threadID: ThreadUpdater.thread.ID}),
'ThreadUpdater', 'ThreadUpdater',