diff --git a/CHANGELOG.md b/CHANGELOG.md index fcdf10fea..7ae888709 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.1 +**v1.10.1.13** *(2015-02-21)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.13/builds/4chan-X-noupdate.crx "Chromium version")] +- Focus on checkbox when captcha is tabbed into. + **v1.10.1.12** *(2015-02-20)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.12/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.12/builds/4chan-X-noupdate.crx "Chromium version")] - Work around new scrolling issue when tabbing into captcha on Chromium. diff --git a/LICENSE b/LICENSE index f9b6fad10..07ca19b63 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.10.1.12 +* 4chan X - Version 1.10.1.13 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index e86928b26..14a027d57 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 91acbd03b..f47fdf545 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.10.1.12 +// @version 1.10.1.13 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,6 +10,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @grant GM_getValue // @grant GM_setValue diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index a05288663..319caf37b 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.10.1.12 +// @version 1.10.1.13 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @grant GM_getValue // @grant GM_setValue @@ -25,7 +26,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.12 +* 4chan X - Version 1.10.1.13 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +406,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.12', + VERSION: '1.10.1.13', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -8095,6 +8096,19 @@ }; })(this)); }, + initFrame: function() { + return $.on(window, 'focus', function() { + return $.queueTask(function() { + var checkbox; + if (!(checkbox = $.id('recaptcha-anchor'))) { + return; + } + if (d.activeElement !== checkbox) { + return checkbox.focus(); + } + }); + }); + }, shouldFocus: false, timeouts: {}, postsCount: 0, @@ -15965,10 +15979,11 @@ Main = { init: function() { - var db, flatten, pathname, _i, _len, _ref, _ref1; + var db, flatten, pathname, type, _i, _len, _ref, _ref1; if (location.hostname === 'www.google.com') { + type = location.pathname === '/recaptcha/api/fallback' ? 'noscript' : 'v2'; return $.ready(function() { - return Captcha.noscript.initFrame(); + return Captcha[type].initFrame(); }); } g.threads = new SimpleDict(); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 1cae8eb4c..f4a433d4a 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 352862d92..ac1e6cf91 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.10.1.12 +// @version 1.10.1.13 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @grant GM_getValue // @grant GM_setValue @@ -24,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.12 +* 4chan X - Version 1.10.1.13 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -404,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.12', + VERSION: '1.10.1.13', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -8094,6 +8095,19 @@ }; })(this)); }, + initFrame: function() { + return $.on(window, 'focus', function() { + return $.queueTask(function() { + var checkbox; + if (!(checkbox = $.id('recaptcha-anchor'))) { + return; + } + if (d.activeElement !== checkbox) { + return checkbox.focus(); + } + }); + }); + }, shouldFocus: false, timeouts: {}, postsCount: 0, @@ -15964,10 +15978,11 @@ Main = { init: function() { - var db, flatten, pathname, _i, _len, _ref, _ref1; + var db, flatten, pathname, type, _i, _len, _ref, _ref1; if (location.hostname === 'www.google.com') { + type = location.pathname === '/recaptcha/api/fallback' ? 'noscript' : 'v2'; return $.ready(function() { - return Captcha.noscript.initFrame(); + return Captcha[type].initFrame(); }); } g.threads = new SimpleDict(); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 4d7fb8698..59f26d725 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 45889a005..4b7122b45 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.1.12 +// @version 1.10.1.13 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,6 +10,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @grant GM_getValue // @grant GM_setValue diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 13b832ef8..191a2d032 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.10.1.12 +// @version 1.10.1.13 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @grant GM_getValue // @grant GM_setValue @@ -25,7 +26,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.1.12 +* 4chan X - Version 1.10.1.13 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +406,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.1.12', + VERSION: '1.10.1.13', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -8095,6 +8096,19 @@ }; })(this)); }, + initFrame: function() { + return $.on(window, 'focus', function() { + return $.queueTask(function() { + var checkbox; + if (!(checkbox = $.id('recaptcha-anchor'))) { + return; + } + if (d.activeElement !== checkbox) { + return checkbox.focus(); + } + }); + }); + }, shouldFocus: false, timeouts: {}, postsCount: 0, @@ -15965,10 +15979,11 @@ Main = { init: function() { - var db, flatten, pathname, _i, _len, _ref, _ref1; + var db, flatten, pathname, type, _i, _len, _ref, _ref1; if (location.hostname === 'www.google.com') { + type = location.pathname === '/recaptcha/api/fallback' ? 'noscript' : 'v2'; return $.ready(function() { - return Captcha.noscript.initFrame(); + return Captcha[type].initFrame(); }); } g.threads = new SimpleDict(); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index e96b1d1d2..5d9b32669 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 3a5dc03fa..ae6f96095 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 e5ea667e8..c4db0e987 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 92300104a..355325a94 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.1.12", + "version": "1.10.1.13", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",