diff --git a/CHANGELOG.md b/CHANGELOG.md index 017472b8f..b4f05d084 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.12 +**v1.10.12.9** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.9/builds/4chan-X-noupdate.crx "Chromium version")] +- Update for captcha changes. +- Work around issue where the captcha causes scrolling to the top of the page. + **v1.10.12.8** *(2015-05-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.8/builds/4chan-X-noupdate.crx "Chromium version")] - Remove guard against dropping files into captcha due to continued reports of disabled captchas. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 5b4434c27..1328dae4c 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 657fdbf88..df7c32b2c 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.12.8 +// @version 1.10.12.9 // @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 7b4379aec..4f92e1398 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.12.8 +// @version 1.10.12.9 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.8', + VERSION: '1.10.12.9', NAMESPACE: '4chan X.', boards: {} }; @@ -6877,9 +6877,8 @@ }); }, inBubble: function() { - return $$('.goog-bubble-content > iframe').some(function(el) { - return el.getBoundingClientRect().bottom > 0; - }); + var ref; + return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; }, inCaptcha: function() { var ref; @@ -7652,7 +7651,7 @@ Captcha = {}; Captcha.fixes = { - css: '.rc-imageselect-target > .rc-imageselect-tile > img:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', + css: '.rc-imageselect-target > div:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', init: function() { switch (location.pathname.split('/')[3]) { case 'anchor': @@ -7690,7 +7689,7 @@ }, fixImages: function() { var focus, img, k, len1, ref; - if (!(this.images = $$('.rc-imageselect-target > .rc-imageselect-tile > img')).length) { + if (!(this.images = $$('.rc-imageselect-target > div')).length) { return; } focus = this.images[0].tabIndex !== 0; @@ -8161,6 +8160,7 @@ if (this.nodes.container) { if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { iframe.focus(); + QR.focus(); delete this.shouldFocus; } return; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 79360c968..98df7f121 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 b70f286a8..d01fb2c05 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.12.8 +// @version 1.10.12.9 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.8', + VERSION: '1.10.12.9', NAMESPACE: '4chan X.', boards: {} }; @@ -6876,9 +6876,8 @@ }); }, inBubble: function() { - return $$('.goog-bubble-content > iframe').some(function(el) { - return el.getBoundingClientRect().bottom > 0; - }); + var ref; + return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; }, inCaptcha: function() { var ref; @@ -7651,7 +7650,7 @@ Captcha = {}; Captcha.fixes = { - css: '.rc-imageselect-target > .rc-imageselect-tile > img:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', + css: '.rc-imageselect-target > div:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', init: function() { switch (location.pathname.split('/')[3]) { case 'anchor': @@ -7689,7 +7688,7 @@ }, fixImages: function() { var focus, img, k, len1, ref; - if (!(this.images = $$('.rc-imageselect-target > .rc-imageselect-tile > img')).length) { + if (!(this.images = $$('.rc-imageselect-target > div')).length) { return; } focus = this.images[0].tabIndex !== 0; @@ -8160,6 +8159,7 @@ if (this.nodes.container) { if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { iframe.focus(); + QR.focus(); delete this.shouldFocus; } return; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 3157fb627..bf8f0927a 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 51de66ef6..7bcc8f691 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.12.8 +// @version 1.10.12.9 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index b50e4c44e..cd27a3797 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.12.8 +// @version 1.10.12.9 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.8', + VERSION: '1.10.12.9', NAMESPACE: '4chan X.', boards: {} }; @@ -6877,9 +6877,8 @@ }); }, inBubble: function() { - return $$('.goog-bubble-content > iframe').some(function(el) { - return el.getBoundingClientRect().bottom > 0; - }); + var ref; + return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0; }, inCaptcha: function() { var ref; @@ -7652,7 +7651,7 @@ Captcha = {}; Captcha.fixes = { - css: '.rc-imageselect-target > .rc-imageselect-tile > img:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', + css: '.rc-imageselect-target > div:focus {\n outline: 2px solid #4a90e2;\n}\n.rc-button-default:focus {\n box-shadow: inset 0 0 0 2px #0063d6;\n}', init: function() { switch (location.pathname.split('/')[3]) { case 'anchor': @@ -7690,7 +7689,7 @@ }, fixImages: function() { var focus, img, k, len1, ref; - if (!(this.images = $$('.rc-imageselect-target > .rc-imageselect-tile > img')).length) { + if (!(this.images = $$('.rc-imageselect-target > div')).length) { return; } focus = this.images[0].tabIndex !== 0; @@ -8161,6 +8160,7 @@ if (this.nodes.container) { if (this.shouldFocus && (iframe = $('iframe', this.nodes.container))) { iframe.focus(); + QR.focus(); delete this.shouldFocus; } return; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index e91fcf4e2..4649537e2 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 faf578856..6f4964740 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 3bbe3fcea..260b5d63a 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 7b4470fc6..45b0072cf 100755 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.12.8", - "date": "2015-05-22T20:36:38.853Z", + "version": "1.10.12.9", + "date": "2015-06-04T01:27:21.391Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",