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

Hard disable 'Force Noscript Captcha for v1' in GM4 for now.

Browse Source
This commit is contained in:
ccd0 2017-11-17 15:02:01 -08:00
parent dea21cb6af
commit e53d2af9b5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Posting/QR.coffee
View File

@ -30,6 +30,8 @@ QR =
version = if Conf[if g.VIEW is 'thread' then 'Use Recaptcha v1' else 'Use Recaptcha v1 on Index'] and (Main.jsEnabled or location.protocol is 'https:') version = if Conf[if g.VIEW is 'thread' then 'Use Recaptcha v1' else 'Use Recaptcha v1 on Index'] and (Main.jsEnabled or location.protocol is 'https:')
noscript = location.protocol is 'https:' and (Conf['Force Noscript Captcha for v1'] or not Main.jsEnabled) noscript = location.protocol is 'https:' and (Conf['Force Noscript Captcha for v1'] or not Main.jsEnabled)
# XXX Frames not yet supported in GM4.
noscript = false if (info = GM?.info) and info.scriptHandler is 'Greasemonkey' and /^4\./.test(info.version)
if noscript then 'noscript' else 'v1' if noscript then 'noscript' else 'v1'
else else
'v2' 'v2'

4
src/main/Main.coffee
View File

@ -70,10 +70,6 @@ Main =
Conf['Bottom QR Link'] = true Conf['Bottom QR Link'] = true
Conf['Toggleable Thread Watcher'] = true Conf['Toggleable Thread Watcher'] = true
# XXX Frames not yet supported in GM4.
if $.engine is 'gecko' and GM?
Conf['Force Noscript Captcha for v1'] = false
# Enforce JS whitelist # Enforce JS whitelist
($.getSync or $.get) {'jsWhitelist': Conf['jsWhitelist']}, ({jsWhitelist}) -> ($.getSync or $.get) {'jsWhitelist': Conf['jsWhitelist']}, ({jsWhitelist}) ->
$.addCSP "script-src #{jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim()}" $.addCSP "script-src #{jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim()}"