From add0f3d3a240bdcc57ce04590d38ac85b2dd2d61 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 22 Dec 2014 12:04:37 -0800
Subject: [PATCH] Revert "Destroy captcha when QR is hidden."

This reverts commit f2260ca2ac3dc7060a33eee77f7ccace21e8f6fe.

Conflicts:
	src/Posting/QR.coffee
---
 src/Miscellaneous/Keybinds.coffee |  1 +
 src/Posting/Captcha.v2.coffee     |  2 +-
 src/Posting/QR.coffee             | 11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 50d484f37..6f93f2c67 100755
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -47,6 +47,7 @@ Keybinds =
             $('.close', notification).click()
         else if QR.nodes and !QR.nodes.el.hidden
           if Conf['Persistent QR']
+            QR.captcha.destroy()
             QR.hide()
           else
             QR.close()
diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index dde05b672..98726a8db 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -37,7 +37,7 @@ Captcha.v2 =
     captchaCount < @postsCount
 
   onNewPost: ->
-    @setup() unless $.hasClass(QR.nodes.el, 'autohide') and !$.hasClass(QR.nodes.el, 'focus')
+    @setup()
 
   onPostChange: ->
     @setup() if @postsCount is 0
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 66acfd418..19b0889be 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -137,9 +137,11 @@ QR =
         QR.nodes.el.contains(d.activeElement) or
         d.activeElement.nodeName is 'IFRAME' and /^https:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src)
       )
-      if $.hasClass(QR.nodes.el, 'autohide') and focus isnt $.hasClass(QR.nodes.el, 'focus')
-        QR.captcha[if focus then 'setup' else 'destroy']()
-      $[if focus then 'addClass' else 'rmClass'] QR.nodes.el, 'focus'
+      if focus
+        QR.captcha.setup() if $.hasClass(QR.nodes.el, 'autohide') and !$.hasClass(QR.nodes.el, 'focus')
+        $.addClass QR.nodes.el, 'focus'
+      else
+        $.rmClass QR.nodes.el, 'focus'
       if chrome?
         # XXX Stop anomalous scrolling on space/tab in captcha iframe.
         if d.activeElement and QR.nodes.el.contains(d.activeElement) and d.activeElement.nodeName is 'IFRAME'
@@ -154,7 +156,6 @@ QR =
     else
       $.off d, 'scroll', QR.scrollLock
   hide: ->
-    QR.captcha.destroy()
     d.activeElement.blur()
     $.addClass QR.nodes.el, 'autohide'
     QR.nodes.autohide.checked = true
@@ -576,7 +577,7 @@ QR =
     QR.cooldown.init()
     QR.captcha.init()
     $.add d.body, dialog
-    QR.captcha.setup() unless Conf['Persistent QR'] and Conf['Auto Hide QR']
+    QR.captcha.setup()
 
     # Create a custom event when the QR dialog is first initialized.
     # Use it to extend the QR's functionalities, or for XTRM RICE.