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

Merge branch 'Stable' into Beta

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2014-12-09 11:14:26 -08:00
commit 92cfb4be1f
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -73,6 +73,12 @@ Based on v1.9.14.2.
- Bug fixes. - Bug fixes.
<!-- v1.9.14.x --> <!-- v1.9.14.x -->
### 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 ### 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")] *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")]

25
src/Posting/QR.captcha.coffee
View File

@ -60,14 +60,25 @@ QR.captcha =
$.globalEval ''' $.globalEval '''
(function() { (function() {
var container = document.querySelector("#qr .captcha-container"); function render() {
container.dataset.widgetID = window.grecaptcha.render(container, { var container = document.querySelector("#qr .captcha-container");
sitekey: '<%= meta.recaptchaKey %>', container.dataset.widgetID = window.grecaptcha.render(container, {
theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light', sitekey: '<%= meta.recaptchaKey %>',
callback: function(response) { theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light',
window.dispatchEvent(new CustomEvent("captcha:success", {detail: response})); 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();
} }
}); }
})(); })();
''' '''