diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e3e17cf..5d8b08d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ### v1.12.1 +**v1.12.1.4** *(2016-07-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.4/builds/4chan-X-noupdate.crx)] +- Re-fix scrolling on space in captcha in Chromium-based browsers. + **v1.12.1.3** *(2016-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.3/builds/4chan-X-noupdate.crx)] - Fix error message in MathJax popups in Firefox. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index a7933b413..cb6aa3f16 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 c2051a5ba..e9fe7ce45 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.12.1.3 +// @version 1.12.1.4 // @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 9d8abf203..650d89143 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.12.1.3 +// @version 1.12.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.12.1.3', + VERSION: '1.12.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -2543,7 +2543,7 @@ input.field.tripped:not(:hover):not(:focus) {\n\ margin: auto;\n\ width: 304px;\n\ }\n\ -/* scrollable with scroll bar hidden; prevents scroll on space press */\n\ +/* XXX scrollable with scroll bar hidden; prevents scroll on space press */\n\ :root.ua-blink #qr .captcha-container > div {\n\ overflow: hidden;\n\ }\n\ @@ -2551,6 +2551,8 @@ input.field.tripped:not(:hover):not(:focus) {\n\ overflow-y: scroll;\n\ overflow-x: hidden;\n\ padding-right: 15px;\n\ + height: 99%;\n\ + width: 100%;\n\ }\n\ #qr .captcha-counter {\n\ display: block;\n\ @@ -18957,6 +18959,8 @@ Captcha = {}; }).call(this); (function() { + var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + Captcha.v2 = { lifetime: 2 * $.MINUTE, init: function() { @@ -19145,6 +19149,7 @@ Captcha = {}; } }, setupIFrame: function(iframe) { + var ref; if (!doc.contains(iframe)) { return; } @@ -19155,11 +19160,16 @@ Captcha = {}; if (d.activeElement === this.nodes.counter) { iframe.focus(); } - return $.global(function() { + $.global(function() { var f; f = document.querySelector('#qr iframe'); return f.focus = f.blur = function() {}; }); + if ($.engine === 'blink' && (ref = iframe.parentNode, indexOf.call($$('#qr .captcha-container > div > div:first-of-type'), ref) >= 0)) { + return $.on(iframe.parentNode, 'scroll', function() { + return this.scrollTop = 0; + }); + } }, fixQRPosition: function() { if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 6fdc62825..46e684db1 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 020d37a2e..644a39d75 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.12.1.3 +// @version 1.12.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.12.1.3', + VERSION: '1.12.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -2543,7 +2543,7 @@ input.field.tripped:not(:hover):not(:focus) {\n\ margin: auto;\n\ width: 304px;\n\ }\n\ -/* scrollable with scroll bar hidden; prevents scroll on space press */\n\ +/* XXX scrollable with scroll bar hidden; prevents scroll on space press */\n\ :root.ua-blink #qr .captcha-container > div {\n\ overflow: hidden;\n\ }\n\ @@ -2551,6 +2551,8 @@ input.field.tripped:not(:hover):not(:focus) {\n\ overflow-y: scroll;\n\ overflow-x: hidden;\n\ padding-right: 15px;\n\ + height: 99%;\n\ + width: 100%;\n\ }\n\ #qr .captcha-counter {\n\ display: block;\n\ @@ -18957,6 +18959,8 @@ Captcha = {}; }).call(this); (function() { + var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + Captcha.v2 = { lifetime: 2 * $.MINUTE, init: function() { @@ -19145,6 +19149,7 @@ Captcha = {}; } }, setupIFrame: function(iframe) { + var ref; if (!doc.contains(iframe)) { return; } @@ -19155,11 +19160,16 @@ Captcha = {}; if (d.activeElement === this.nodes.counter) { iframe.focus(); } - return $.global(function() { + $.global(function() { var f; f = document.querySelector('#qr iframe'); return f.focus = f.blur = function() {}; }); + if ($.engine === 'blink' && (ref = iframe.parentNode, indexOf.call($$('#qr .captcha-container > div > div:first-of-type'), ref) >= 0)) { + return $.on(iframe.parentNode, 'scroll', function() { + return this.scrollTop = 0; + }); + } }, fixQRPosition: function() { if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 6aa3c00a6..a513e2445 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 05d980ae2..3a2c50c26 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.12.1.3 +// @version 1.12.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 67aaeca24..0bba45a03 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.12.1.3 +// @version 1.12.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -136,7 +136,7 @@ docSet = function() { }; g = { - VERSION: '1.12.1.3', + VERSION: '1.12.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -2543,7 +2543,7 @@ input.field.tripped:not(:hover):not(:focus) {\n\ margin: auto;\n\ width: 304px;\n\ }\n\ -/* scrollable with scroll bar hidden; prevents scroll on space press */\n\ +/* XXX scrollable with scroll bar hidden; prevents scroll on space press */\n\ :root.ua-blink #qr .captcha-container > div {\n\ overflow: hidden;\n\ }\n\ @@ -2551,6 +2551,8 @@ input.field.tripped:not(:hover):not(:focus) {\n\ overflow-y: scroll;\n\ overflow-x: hidden;\n\ padding-right: 15px;\n\ + height: 99%;\n\ + width: 100%;\n\ }\n\ #qr .captcha-counter {\n\ display: block;\n\ @@ -18957,6 +18959,8 @@ Captcha = {}; }).call(this); (function() { + var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + Captcha.v2 = { lifetime: 2 * $.MINUTE, init: function() { @@ -19145,6 +19149,7 @@ Captcha = {}; } }, setupIFrame: function(iframe) { + var ref; if (!doc.contains(iframe)) { return; } @@ -19155,11 +19160,16 @@ Captcha = {}; if (d.activeElement === this.nodes.counter) { iframe.focus(); } - return $.global(function() { + $.global(function() { var f; f = document.querySelector('#qr iframe'); return f.focus = f.blur = function() {}; }); + if ($.engine === 'blink' && (ref = iframe.parentNode, indexOf.call($$('#qr .captcha-container > div > div:first-of-type'), ref) >= 0)) { + return $.on(iframe.parentNode, 'scroll', function() { + return this.scrollTop = 0; + }); + } }, fixQRPosition: function() { if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 7d4d156c4..0886ebbb5 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 529f915d6..ab88272a8 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 a73e0244a..8161442b7 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 48c73fbcd..f8f188869 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.12.1.3", - "date": "2016-07-07T23:01:41.318Z" + "version": "1.12.1.4", + "date": "2016-07-09T16:29:32.443Z" } \ No newline at end of file