From f0d76d8ef70be694e26d5022931b6e2b25a2c2e5 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Tue, 17 Nov 2015 17:36:18 -0800
Subject: [PATCH] Replace shouldFocus flag with focus on counter.

---
 src/Posting/Captcha.v2.coffee | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index 9c8102978..70c486bf6 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -42,7 +42,6 @@ Captcha.v2 =
       conn = new Connection window.parent, "#{location.protocol}//boards.4chan.org"
       conn.send {token}
 
-  shouldFocus: false
   timeouts: {}
   postsCount: 0
 
@@ -74,17 +73,16 @@ Captcha.v2 =
 
   setup: (focus, force) ->
     return unless @isEnabled and (@needed() or force)
-    @shouldFocus = true if focus and not QR.inBubble()
+    @nodes.counter.focus() if focus and not QR.inBubble()
     if @timeouts.destroy
       clearTimeout @timeouts.destroy
       delete @timeouts.destroy
       return @reload()
 
     if @nodes.container
-      if @shouldFocus and iframe = $ 'iframe', @nodes.container
+      if d.activeElement is @nodes.counter and (iframe = $ 'iframe', @nodes.container)
         iframe.focus()
         QR.focus() # Event handler not fired in Firefox
-        delete @shouldFocus
       return
 
     @nodes.container = $.el 'div', className: 'captcha-container'
@@ -143,8 +141,7 @@ Captcha.v2 =
     if QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight
       QR.nodes.el.style.top    = null
       QR.nodes.el.style.bottom = '0px'
-    iframe.focus() if @shouldFocus
-    @shouldFocus = false
+    iframe.focus() if d.activeElement is @nodes.counter
     # XXX Stop Recaptcha from changing focus from iframe -> body -> iframe on submit.
     $.global ->
       f = document.querySelector('#qr iframe')
@@ -193,7 +190,7 @@ Captcha.v2 =
     if @needed()
       if focus
         if QR.cooldown.auto or Conf['Post on Captcha Completion']
-          @shouldFocus = true
+          @nodes.counter.focus()
         else
           QR.nodes.status.focus()
       @reload()