Small cooldown fixes.

This commit is contained in:
Mayhem 2013-09-19 13:53:24 +02:00
parent 5ae957b0e2
commit 7aaa91508c

View File

@ -230,6 +230,7 @@ QR =
setTimers = (e) => QR.cooldown.types = e.detail setTimers = (e) => QR.cooldown.types = e.detail
$.on window, 'cooldown:timers', setTimers $.on window, 'cooldown:timers', setTimers
$.globalEval 'window.dispatchEvent(new CustomEvent("cooldown:timers", {detail: cooldowns}))' $.globalEval 'window.dispatchEvent(new CustomEvent("cooldown:timers", {detail: cooldowns}))'
QR.cooldown.types or= {} # XXX tmp workaround until all pages and the catalogs get the cooldowns var.
$.off window, 'cooldown:timers', setTimers $.off window, 'cooldown:timers', setTimers
for type of QR.cooldown.types for type of QR.cooldown.types
QR.cooldown.types[type] = +QR.cooldown.types[type] QR.cooldown.types[type] = +QR.cooldown.types[type]
@ -316,7 +317,7 @@ QR =
'image' 'image'
else else
'reply' 'reply'
maxTimer = Math.max types[type], types[type + '_intra'] or 0 maxTimer = Math.max types[type] or 0, types[type + '_intra'] or 0
unless start <= now <= start + maxTimer * $.SECOND unless start <= now <= start + maxTimer * $.SECOND
QR.cooldown.unset start QR.cooldown.unset start
type += '_intra' if isReply and +post.thread is cooldown.threadID type += '_intra' if isReply and +post.thread is cooldown.threadID