Move 'Use Recaptcha v2 in Reports' into Captcha.replace.

This commit is contained in:
ccd0 2015-06-22 21:15:39 -07:00
parent 5dec400267
commit 12e44e0ca5
2 changed files with 18 additions and 16 deletions

View File

@ -3,15 +3,13 @@ Report =
init: ->
return unless /\bmode=report\b/.test(location.search) and match = location.search.match /\bno=(\d+)/
Captcha.replace.init() unless Conf['Use Recaptcha v2 in Reports']
Captcha.replace.init()
@postID = +match[1]
$.ready @ready
ready: ->
$.addStyle Report.css
Report.archive() if Conf['Archive Report']
if Conf['Use Recaptcha v2 in Reports']
Report.captchaV2()
if Conf['Use Recaptcha v2 in Reports'] and $.hasClass doc, 'js-enabled'
new MutationObserver(-> Report.fit '.gc-bubbleDefault').observe d.body,
childList: true
@ -20,19 +18,6 @@ Report =
else
Report.fit 'body'
captchaV2: ->
return unless old = $.id 'captchaContainerAlt'
container = $.el 'div',
className: 'g-recaptcha'
container.dataset.sitekey = '<%= meta.recaptchaKey %>'
$.replace old, container
url = 'https://www.google.com/recaptcha/api.js'
if lang = Conf['captchaLanguage'].trim()
url += "?hl=#{encodeURIComponent lang}"
script = $.el 'script',
src: url
$.add d.head, script
fit: (selector) ->
return unless el = $ selector, doc
dy = el.getBoundingClientRect().bottom - doc.clientHeight + 8

View File

@ -3,12 +3,29 @@ Captcha.replace =
return unless d.cookie.indexOf('pass_enabled=1') < 0
return if location.hostname is 'boards.4chan.org' and Conf['Hide Original Post Form']
if location.hostname is 'sys.4chan.org' and Conf['Use Recaptcha v2 in Reports']
$.ready Captcha.replace.v2
return
if Conf['captchaLanguage'].trim()
if location.hostname is 'boards.4chan.org'
$.onExists doc, '#captchaFormPart', true, (node) -> $.onExists node, 'iframe', true, Captcha.replace.iframe
else
$.onExists doc, 'iframe', true, Captcha.replace.iframe
v2: ->
return unless old = $.id 'captchaContainerAlt'
container = $.el 'div',
className: 'g-recaptcha'
container.dataset.sitekey = '<%= meta.recaptchaKey %>'
$.replace old, container
url = 'https://www.google.com/recaptcha/api.js'
if lang = Conf['captchaLanguage'].trim()
url += "?hl=#{encodeURIComponent lang}"
script = $.el 'script',
src: url
$.add d.head, script
iframe: (el) ->
return unless lang = Conf['captchaLanguage'].trim()
src = if /[?&]hl=/.test el.src