diff --git a/CHANGELOG.md b/CHANGELOG.md index 253afa038..258b83110 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,12 @@ Based on v1.9.14.2. - Bug fixes. +### v1.9.14.9 +*2014-12-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.9/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Fix bug causing `Auto-load captcha` to not work when using `Persistent QR`. + ### v1.9.14.8 *2014-12-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.14.8/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/src/Posting/QR.captcha.coffee b/src/Posting/QR.captcha.coffee index a99fe7bb8..8a62d8b09 100644 --- a/src/Posting/QR.captcha.coffee +++ b/src/Posting/QR.captcha.coffee @@ -60,14 +60,25 @@ QR.captcha = $.globalEval ''' (function() { - var container = document.querySelector("#qr .captcha-container"); - container.dataset.widgetID = window.grecaptcha.render(container, { - sitekey: '<%= meta.recaptchaKey %>', - theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light', - callback: function(response) { - window.dispatchEvent(new CustomEvent("captcha:success", {detail: response})); + function render() { + var container = document.querySelector("#qr .captcha-container"); + container.dataset.widgetID = window.grecaptcha.render(container, { + sitekey: '<%= meta.recaptchaKey %>', + theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light', + callback: function(response) { + window.dispatchEvent(new CustomEvent("captcha:success", {detail: response})); + } + }); + } + if (window.grecaptcha) { + render(); + } else { + var cbNative = window.onRecaptchaLoaded; + window.onRecaptchaLoaded = function() { + render(); + cbNative(); } - }); + } })(); '''