From dcc76472932971727d8cd1bf60bf7ba6fd06460d Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sun, 21 Jun 2015 10:02:15 -0700 Subject: [PATCH] Captcha caching doesn't work on v1; remove it. --- src/Posting/Captcha.v1.coffee | 64 +++-------------------------------- 1 file changed, 5 insertions(+), 59 deletions(-) diff --git a/src/Posting/Captcha.v1.coffee b/src/Posting/Captcha.v1.coffee index a9e04305a..67154e166 100644 --- a/src/Posting/Captcha.v1.coffee +++ b/src/Posting/Captcha.v1.coffee @@ -33,10 +33,6 @@ Captcha.v1 = $.after QR.nodes.com.parentNode, [imgContainer, input] @captchas = [] - $.get 'captchas', [], ({captchas}) -> - QR.captcha.sync captchas - QR.captcha.clear() - $.sync 'captchas', @sync new MutationObserver(@afterSetup).observe $.id('captchaContainer'), childList: true @@ -51,7 +47,6 @@ Captcha.v1 = img.parentNode.hidden = true input.value = '' input.placeholder = 'Focus to load reCAPTCHA' - @count() $.on input, 'focus click', @cb.focus needed: -> @@ -95,7 +90,6 @@ Captcha.v1 = {img, input} = QR.captcha.nodes img.parentNode.hidden = false input.placeholder = 'Verification' - QR.captcha.count() $.off input, 'focus click', QR.captcha.cb.focus QR.captcha.nodes.challenge = challenge @@ -114,45 +108,13 @@ Captcha.v1 = $.globalEval 'Recaptcha.destroy()' @beforeSetup() - sync: (captchas=[]) -> - QR.captcha.captchas = captchas - QR.captcha.count() - getOne: -> - @clear() - if captcha = @captchas.shift() - {challenge, response} = captcha - @count() - $.set 'captchas', @captchas + challenge = @nodes.img.alt + if /\S/.test(response = @nodes.input.value) + @destroy() + {challenge, response} else - challenge = @nodes.img.alt - if /\S/.test(response = @nodes.input.value) - @destroy() - else - return null - {challenge, response} - - save: -> - return unless /\S/.test(response = @nodes.input.value) - @nodes.input.value = '' - @captchas.push - challenge: @nodes.img.alt - response: response - timeout: @timeout - @count() - @reload() - $.set 'captchas', @captchas - - clear: -> - return unless @captchas.length - $.forceSync 'captchas' - now = Date.now() - for captcha, i in @captchas - break if captcha.timeout > now - return unless i - @captchas = @captchas[i..] - @count() - $.set 'captchas', @captchas + null load: -> return unless @nodes.challenge.firstChild @@ -163,20 +125,6 @@ Captcha.v1 = @nodes.img.alt = challenge @nodes.img.src = challenge_image.src @nodes.input.value = null - @clear() - - count: -> - count = if @captchas then @captchas.length else 0 - placeholder = @nodes.input.placeholder.replace /\ \(.*\)$/, '' - placeholder += switch count - when 0 - if placeholder is 'Verification' then ' (Shift + Enter to cache)' else '' - when 1 - ' (1 cached captcha)' - else - " (#{count} cached captchas)" - @nodes.input.placeholder = placeholder - @nodes.input.alt = count # For XTRM RICE. reload: (focus) -> # Hack to prevent the input from being focused @@ -187,8 +135,6 @@ Captcha.v1 = keydown: (e) -> if e.keyCode is 8 and not @nodes.input.value @reload() - else if e.keyCode is 13 and e.shiftKey - @save() else return e.preventDefault()