From 6439b8d7aa1021cef1fe79aa63bc0184cc6dff9b Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 28 Apr 2014 21:04:35 -0700
Subject: [PATCH] Partly restore Mayhem's captcha fix

Destroy captcha after posting instead of reloading it.
Not strictly necessary since Google no longer blocks caching
but a good idea to reduce the number of captcha loads.

Keep captcha caching.
---
 src/Posting/QR.captcha.coffee | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Posting/QR.captcha.coffee b/src/Posting/QR.captcha.coffee
index 029620f1f..d53c0b575 100644
--- a/src/Posting/QR.captcha.coffee
+++ b/src/Posting/QR.captcha.coffee
@@ -1,8 +1,7 @@
 QR.captcha =
   init: ->
     return if d.cookie.indexOf('pass_enabled=1') >= 0
-    container = $.id 'captchaContainer'
-    return unless @isEnabled = !!container
+    return unless @isEnabled = !!$.id 'captchaContainer'
 
     $.globalEval 'loadRecaptcha()' if Conf['Auto-load captcha']
 
@@ -10,11 +9,9 @@ QR.captcha =
       className: 'captcha-img'
       title: 'Reload reCAPTCHA'
       innerHTML: '<img>'
-      hidden: true
     input = $.el 'input',
       className: 'captcha-input field'
       title: 'Verification'
-      placeholder: 'Focus to load reCAPTCHA'
       autocomplete: 'off'
       spellcheck: false
       tabIndex: 45
@@ -22,17 +19,22 @@ QR.captcha =
       img:       imgContainer.firstChild
       input:     input
 
-    $.on input, 'focus', @setup
-
     $.on input, 'blur',  QR.focusout
     $.on input, 'focus', QR.focusin
 
     $.addClass QR.nodes.el, 'has-captcha'
     $.after QR.nodes.com.parentNode, [imgContainer, input]
-    
-    @setupObserver = new MutationObserver @afterSetup
-    @setupObserver.observe container, childList: true
+
+    @beforeSetup()
     @afterSetup() # reCAPTCHA might have loaded before the QR.
+  beforeSetup: ->
+    {img, input} = @nodes
+    img.parentNode.hidden = true
+    input.value = ''
+    input.placeholder = 'Focus to load reCAPTCHA'
+    $.on input, 'focus', @setup
+    @setupObserver = new MutationObserver @afterSetup
+    @setupObserver.observe $.id('captchaContainer'), childList: true
   setup: ->
     $.globalEval 'loadRecaptcha()'
   afterSetup: ->
@@ -47,6 +49,7 @@ QR.captcha =
 
     {img, input} = QR.captcha.nodes
     img.parentNode.hidden = false
+    input.placeholder = 'Verification'
     $.off input, 'focus', QR.captcha.setup
     $.on input, 'keydown', QR.captcha.keydown.bind QR.captcha
     $.on img.parentNode, 'click', QR.captcha.reload.bind QR.captcha
@@ -61,6 +64,9 @@ QR.captcha =
       subtree: true
       attributes: true
     QR.captcha.load()
+  destroy: ->
+    $.globalEval 'Recaptcha.destroy()'
+    @beforeSetup()
 
   sync: (captchas) ->
     QR.captcha.captchas = captchas
@@ -74,7 +80,7 @@ QR.captcha =
       $.set 'captchas', @captchas
     else
       challenge   = @nodes.img.alt
-      if response = @nodes.input.value then @reload()
+      if response = @nodes.input.value then @destroy()
     if response
       response = response.trim()
       # one-word-captcha: