Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make 'Use Recaptcha v1' override 'Force Noscript Captcha' again.

Browse Source
This commit is contained in:
ccd0 2015-11-23 22:46:55 -08:00
parent e511e7e8d3
commit a8e84b83d9
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/General/Config.coffee
View File

@ -486,7 +486,7 @@ Config =
] ]
'Use Recaptcha v1': [ 'Use Recaptcha v1': [
false false
'Use the old text version of Recaptcha.' 'Use the old text version of Recaptcha where possible.'
] ]
'Use Recaptcha v2 in Reports': [ 'Use Recaptcha v2 in Reports': [
false false

14
src/Posting/Captcha.replace.coffee
View File

@ -2,18 +2,20 @@ Captcha.replace =
init: -> init: ->
return unless d.cookie.indexOf('pass_enabled=1') < 0 return unless d.cookie.indexOf('pass_enabled=1') < 0
if Conf['Force Noscript Captcha'] and Main.jsEnabled if location.hostname is 'sys.4chan.org' and Main.jsEnabled
$.ready Captcha.replace.noscript if Conf['Use Recaptcha v2 in Reports']
return type = if Conf['Force Noscript Captcha'] then 'noscript' else 'v2'
$.ready Captcha.replace[type]
if location.hostname is 'sys.4chan.org' and Conf['Use Recaptcha v2 in Reports'] and Main.jsEnabled
$.ready Captcha.replace.v2
return return
if Conf['Use Recaptcha v1'] and Main.jsEnabled and location.hostname isnt 'www.4chan.org' if Conf['Use Recaptcha v1'] and Main.jsEnabled and location.hostname isnt 'www.4chan.org'
$.ready Captcha.replace.v1 $.ready Captcha.replace.v1
return return
if Conf['Force Noscript Captcha'] and Main.jsEnabled
$.ready Captcha.replace.noscript
return
if Conf['captchaLanguage'].trim() or Conf['Captcha Fixes'] if Conf['captchaLanguage'].trim() or Conf['Captcha Fixes']
if location.hostname is 'boards.4chan.org' if location.hostname is 'boards.4chan.org'
$.onExists doc, '#captchaFormPart', true, (node) -> $.onExists node, 'iframe', true, Captcha.replace.iframe $.onExists doc, '#captchaFormPart', true, (node) -> $.onExists node, 'iframe', true, Captcha.replace.iframe

5
src/Posting/QR.coffee
View File

@ -29,10 +29,7 @@ QR =
return if g.VIEW is 'archive' return if g.VIEW is 'archive'
version = if Conf['Use Recaptcha v1'] and not Conf['Force Noscript Captcha'] and Main.jsEnabled version = if Conf['Use Recaptcha v1'] and Main.jsEnabled then 'v1' else 'v2'
'v1'
else
'v2'
@captcha = Captcha[version] @captcha = Captcha[version]
$.on d, '4chanXInitFinished', @initReady $.on d, '4chanXInitFinished', @initReady