From e43db40140c37f1235151adc589ab74ec8dd0256 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 11 Nov 2014 21:39:19 -0800 Subject: [PATCH] QR cooldown no longer depends on Javascript being enabled. --- src/Posting/QR.cooldown.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Posting/QR.cooldown.coffee b/src/Posting/QR.cooldown.coffee index 611d832dd..be4104e00 100644 --- a/src/Posting/QR.cooldown.coffee +++ b/src/Posting/QR.cooldown.coffee @@ -5,10 +5,11 @@ QR.cooldown = return unless Conf['Cooldown'] # Read cooldown times - setTimers = (e) => QR.cooldown.delays = e.detail - $.on window, 'cooldown:timers', setTimers - $.globalEval 'window.dispatchEvent(new CustomEvent("cooldown:timers", {detail: cooldowns}))' - $.off window, 'cooldown:timers', setTimers + scriptData = $('script:not([src])', d.head)?.textContent or '' + QR.cooldown.delays = if m = scriptData.match /\bcooldowns *= *({[^}]+})/ + JSON.parse m[1] + else + {thread: 0, reply: 0, image: 0, reply_intra: 0, image_intra: 0} # The longest reply cooldown, for use in pruning old reply data QR.cooldown.maxDelay = 0