diff --git a/CHANGELOG.md b/CHANGELOG.md index bff258970..1f47fe55d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.22 +**v1.11.22.3** *(2016-01-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.3/builds/4chan-X-noupdate.crx "Chromium version")] +- Report captcha related bug fixes. + **v1.11.22.2** *(2016-01-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.crx "Chromium version")] - Update due to 4chan changing to Recaptcha v2 on report form. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index f5e044bbb..4af9a4650 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 22ec8c366..26dcfbffb 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.22.2 +// @version 1.11.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index e3b993ab8..26a92ac70 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.11.22.2 +// @version 1.11.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -434,7 +434,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.22.2', + VERSION: '1.11.22.3', NAMESPACE: '4chan X.', boards: {} }; @@ -12849,7 +12849,7 @@ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) { a.textContent = 'Report'; ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; - ReportLink.dims = 'width=400,height=550'; + ReportLink.dims = Conf['Use Recaptcha v1 in Reports'] || d.cookie.indexOf('pass_enabled=1') >= 0 ? 'width=350,height=275' : 'width=400,height=550'; } else if (Conf['Archive Report']) { a.textContent = 'Report to archive'; ReportLink.url = Redirect.to('report', { @@ -16558,7 +16558,7 @@ }) ]); } - if (Conf['Use Recaptcha v2 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { + if (!Conf['Use Recaptcha v1 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { new MutationObserver(function() { Report.fit('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return Report.fit('body'); @@ -16570,11 +16570,8 @@ } else { Report.fit('body'); } - if (!Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { + if (Conf['Use Recaptcha v1 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { $.onExists(d.body, '#recaptcha_image', function(image) { - $.global(function() { - return document.getElementById('recaptcha_image').removeEventListener('click', window.onAltCaptchaClick, false); - }); return $.on(image, 'click', function() { if ($.id('recaptcha_challenge_image')) { return $.global(function() { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index d95ec9267..a175e0ed0 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 2e60fb502..d2ceba8aa 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.22.2 +// @version 1.11.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -434,7 +434,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.22.2', + VERSION: '1.11.22.3', NAMESPACE: '4chan X.', boards: {} }; @@ -12849,7 +12849,7 @@ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) { a.textContent = 'Report'; ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; - ReportLink.dims = 'width=400,height=550'; + ReportLink.dims = Conf['Use Recaptcha v1 in Reports'] || d.cookie.indexOf('pass_enabled=1') >= 0 ? 'width=350,height=275' : 'width=400,height=550'; } else if (Conf['Archive Report']) { a.textContent = 'Report to archive'; ReportLink.url = Redirect.to('report', { @@ -16558,7 +16558,7 @@ }) ]); } - if (Conf['Use Recaptcha v2 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { + if (!Conf['Use Recaptcha v1 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { new MutationObserver(function() { Report.fit('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return Report.fit('body'); @@ -16570,11 +16570,8 @@ } else { Report.fit('body'); } - if (!Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { + if (Conf['Use Recaptcha v1 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { $.onExists(d.body, '#recaptcha_image', function(image) { - $.global(function() { - return document.getElementById('recaptcha_image').removeEventListener('click', window.onAltCaptchaClick, false); - }); return $.on(image, 'click', function() { if ($.id('recaptcha_challenge_image')) { return $.global(function() { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 699bf565a..72039e29e 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 0360278ec..c7006609e 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.22.2 +// @version 1.11.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 35d3b9997..1a7255230 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.22.2 +// @version 1.11.22.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -434,7 +434,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.22.2', + VERSION: '1.11.22.3', NAMESPACE: '4chan X.', boards: {} }; @@ -12849,7 +12849,7 @@ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) { a.textContent = 'Report'; ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; - ReportLink.dims = 'width=400,height=550'; + ReportLink.dims = Conf['Use Recaptcha v1 in Reports'] || d.cookie.indexOf('pass_enabled=1') >= 0 ? 'width=350,height=275' : 'width=400,height=550'; } else if (Conf['Archive Report']) { a.textContent = 'Report to archive'; ReportLink.url = Redirect.to('report', { @@ -16558,7 +16558,7 @@ }) ]); } - if (Conf['Use Recaptcha v2 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { + if (!Conf['Use Recaptcha v1 in Reports'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled) { new MutationObserver(function() { Report.fit('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return Report.fit('body'); @@ -16570,11 +16570,8 @@ } else { Report.fit('body'); } - if (!Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { + if (Conf['Use Recaptcha v1 in Reports'] && Main.jsEnabled && d.cookie.indexOf('pass_enabled=1') < 0) { $.onExists(d.body, '#recaptcha_image', function(image) { - $.global(function() { - return document.getElementById('recaptcha_image').removeEventListener('click', window.onAltCaptchaClick, false); - }); return $.on(image, 'click', function() { if ($.id('recaptcha_challenge_image')) { return $.global(function() { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index c6cd69987..bac5ff2fb 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index cb88b98ad..3c32908fd 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 2cbe43f5e..66c46517f 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index e8151cf5a..4e5930572 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.11.22.2", - "date": "2016-01-18T16:37:54.258Z" + "version": "1.11.22.3", + "date": "2016-01-18T17:11:07.511Z" }