From 29afe886253737ffec732ca85a5742d461f98ccf Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 14 Mar 2015 10:07:11 -0700
Subject: [PATCH] Nuke 'Captcha Warning Notifications' option.

---
 src/General/Config.coffee           |  5 -----
 src/General/css/style.css           |  3 ---
 src/Posting/Captcha.noscript.coffee | 11 -----------
 src/Posting/Captcha.v2.coffee       |  3 ---
 src/Posting/QR.coffee               |  4 +---
 5 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 60c3822af..6dc6fe05b 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -450,11 +450,6 @@ Config =
         'Use the non-Javascript fallback captcha in the QR even if Javascript is enabled.'
         1
       ]
-      'Captcha Warning Notifications': [
-        true
-        'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'
-        1
-      ]
       'Auto-load captcha': [
         false
         'Automatically load the captcha in the QR even if your post is empty.'
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 532e62b48..3ab40b799 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -1235,9 +1235,6 @@ input.field.tripped:not(:hover):not(:focus) {
   width: 100%;
   margin: 1px 0 0;
 }
-.captcha-input.error:focus {
-  border-color: rgb(255,0,0) !important;
-}
 #qr-captcha-iframe {
   display: none;
 }
diff --git a/src/Posting/Captcha.noscript.coffee b/src/Posting/Captcha.noscript.coffee
index ceebc68f5..8298494da 100644
--- a/src/Posting/Captcha.noscript.coffee
+++ b/src/Posting/Captcha.noscript.coffee
@@ -114,7 +114,6 @@ Captcha.noscript =
     $.rm @nodes.iframe if @nodes.iframe
     delete @nodes.iframe
     delete @occupied
-    @unflag()
     @beforeSetup()
 
   sync: (captchas=[]) ->
@@ -163,16 +162,6 @@ Captcha.noscript =
       delete @submitCB
     QR.error "Captcha Error: #{message}"
 
-  notify: (el) ->
-    if Conf['Captcha Warning Notifications'] and !d.hidden
-      QR.notify el
-    else
-      $.addClass @nodes.input, 'error'
-      $.one @nodes.input, 'keydown', @unflag.bind @
-
-  unflag: ->
-    $.rmClass @nodes.input, 'error'
-
   clear: ->
     return unless @captchas.length
     $.forceSync 'captchas'
diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee
index 68c484fd1..1aad5b1d7 100644
--- a/src/Posting/Captcha.v2.coffee
+++ b/src/Posting/Captcha.v2.coffee
@@ -163,9 +163,6 @@ Captcha.v2 =
 
     QR.submit() if Conf['Post on Captcha Completion'] and !QR.cooldown.auto
 
-  notify: (el) ->
-    QR.notify el
-
   clear: ->
     return unless @captchas.length
     $.forceSync 'captchas'
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index d19f0665f..e61499952 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -179,9 +179,7 @@ QR =
       el.removeAttribute 'style'
     if QR.captcha.isEnabled and /captcha|verification/i.test el.textContent
       QR.captcha.setup true
-      QR.captcha.notify el
-    else
-      QR.notify el
+    QR.notify el
     alert el.textContent if d.hidden and not QR.cooldown.auto
 
   notify: (el) ->