Merge branch '1.8.8.x' into 1.8.9.x

This commit is contained in:
ccd0 2014-08-12 22:57:30 -07:00
commit 59c1355203
2 changed files with 22 additions and 9 deletions

View File

@ -159,6 +159,8 @@ Main =
new Notice 'warning', 'Cookies need to be enabled on 4chan for <%= meta.name %> to operate properly.', 30 new Notice 'warning', 'Cookies need to be enabled on 4chan for <%= meta.name %> to operate properly.', 30
initThread: -> initThread: ->
g.DEAD = !!$('.closed')?.textContent.match(/Thread archived/)
if board = $ '.board' if board = $ '.board'
threads = [] threads = []
posts = [] posts = []

View File

@ -74,7 +74,10 @@ ThreadUpdater =
$.on d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost $.on d, 'QRPostSuccessful', ThreadUpdater.cb.checkpost
$.on d, 'visibilitychange', ThreadUpdater.cb.visibility $.on d, 'visibilitychange', ThreadUpdater.cb.visibility
ThreadUpdater.cb.online() if g.DEAD
ThreadUpdater.set 'status', 'Archived', 'warning'
else
ThreadUpdater.cb.online()
### ###
http://freesound.org/people/pierrecartoons1979/sounds/90112/ http://freesound.org/people/pierrecartoons1979/sounds/90112/
@ -84,6 +87,7 @@ ThreadUpdater =
cb: cb:
online: -> online: ->
return if g.DEAD
if ThreadUpdater.online = navigator.onLine if ThreadUpdater.online = navigator.onLine
ThreadUpdater.outdateCount = 0 ThreadUpdater.outdateCount = 0
ThreadUpdater.setInterval() ThreadUpdater.setInterval()
@ -127,18 +131,17 @@ ThreadUpdater =
{req} = ThreadUpdater {req} = ThreadUpdater
switch req.status switch req.status
when 200 when 200
g.DEAD = false g.DEAD = !!+req.response.posts[0].archived
ThreadUpdater.parse req.response.posts ThreadUpdater.parse req.response.posts
ThreadUpdater.setInterval() if g.DEAD
ThreadUpdater.set 'status', 'Archived', 'warning'
ThreadUpdater.kill()
else
ThreadUpdater.setInterval()
when 404 when 404
g.DEAD = true g.DEAD = true
ThreadUpdater.set 'timer', null
ThreadUpdater.set 'status', '404', 'warning' ThreadUpdater.set 'status', '404', 'warning'
clearTimeout ThreadUpdater.timeoutID ThreadUpdater.kill()
ThreadUpdater.thread.kill()
$.event 'ThreadUpdate',
404: true
threadID: ThreadUpdater.thread.fullID
else else
ThreadUpdater.outdateCount++ ThreadUpdater.outdateCount++
ThreadUpdater.setInterval() ThreadUpdater.setInterval()
@ -151,6 +154,14 @@ ThreadUpdater =
if ThreadUpdater.postID if ThreadUpdater.postID
ThreadUpdater.cb.checkpost() ThreadUpdater.cb.checkpost()
kill: ->
ThreadUpdater.set 'timer', null
clearTimeout ThreadUpdater.timeoutID
ThreadUpdater.thread.kill()
$.event 'ThreadUpdate',
404: true
threadID: ThreadUpdater.thread.fullID
setInterval: -> setInterval: ->
i = ThreadUpdater.interval + 1 i = ThreadUpdater.interval + 1