diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f067277e..255565ce1 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.13 +**v1.10.13.4** *(2015-06-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.4/builds/4chan-X-noupdate.crx "Chromium version")] +- Support selecting images in the image captcha with the space bar in addition to the enter key. + **v1.10.13.3** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.3/builds/4chan-X-noupdate.crx "Chromium version")] - Merge v1.10.12.10: Revert workaround for scrolling to top as it seems to have been fixed on Google's end. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index eb5cf2c4a..7c34f309b 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 aeb7f78a8..318fb7476 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.13.3 +// @version 1.10.13.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 b72d4b2c5..e81d530ad 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.13.3 +// @version 1.10.13.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.13.3', + VERSION: '1.10.13.4', NAMESPACE: '4chan X.', boards: {} }; @@ -7732,7 +7732,11 @@ } x = d.activeElement === verify ? 11 : 9; } - if (!(dx = { + if (e.keyCode === 32 && x < 9) { + this.images[x].click(); + e.preventDefault(); + return e.stopPropagation(); + } else if (dx = { 38: 9, 40: 3, 37: 11, @@ -7741,19 +7745,18 @@ 75: 3, 74: 11, 76: 1 - }[e.keyCode])) { - return; + }[e.keyCode]) { + x = (x + dx) % 12; + if (x === 10) { + x = dx === 11 ? 9 : 11; + } + (this.images[x] || { + 9: reload, + 11: verify + }[x]).focus(); + e.preventDefault(); + return e.stopPropagation(); } - x = (x + dx) % 12; - if (x === 10) { - x = dx === 11 ? 9 : 11; - } - (this.images[x] || { - 9: reload, - 11: verify - }[x]).focus(); - e.preventDefault(); - return e.stopPropagation(); } }; @@ -9357,7 +9360,7 @@ return $.add(Gallery.nodes.thumbs, thumb); }, open: function(thumb) { - var el, elType, file, name, newID, nodes, oldID, post, ref, slideshow; + var el, elType, file, name, newID, nodes, oldID, post, slideshow; nodes = Gallery.nodes; name = nodes.name; oldID = +nodes.current.dataset.id; @@ -9397,8 +9400,8 @@ } else { Gallery.cb.stop(); } - if (Conf['Scroll to Post'] && (post = (ref = (post = g.posts[file.dataset.post])) != null ? ref.nodes.root : void 0)) { - Header.scrollTo(post); + if (Conf['Scroll to Post'] && (post = g.posts[file.dataset.post])) { + Header.scrollTo(post.nodes.root); } return nodes.thumbs.scrollTop = thumb.offsetTop + thumb.offsetHeight / 2 - nodes.thumbs.clientHeight / 2; }, diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index e73ada053..ba8c89051 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 56fa47014..924dac779 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.13.3 +// @version 1.10.13.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.13.3', + VERSION: '1.10.13.4', NAMESPACE: '4chan X.', boards: {} }; @@ -7731,7 +7731,11 @@ } x = d.activeElement === verify ? 11 : 9; } - if (!(dx = { + if (e.keyCode === 32 && x < 9) { + this.images[x].click(); + e.preventDefault(); + return e.stopPropagation(); + } else if (dx = { 38: 9, 40: 3, 37: 11, @@ -7740,19 +7744,18 @@ 75: 3, 74: 11, 76: 1 - }[e.keyCode])) { - return; + }[e.keyCode]) { + x = (x + dx) % 12; + if (x === 10) { + x = dx === 11 ? 9 : 11; + } + (this.images[x] || { + 9: reload, + 11: verify + }[x]).focus(); + e.preventDefault(); + return e.stopPropagation(); } - x = (x + dx) % 12; - if (x === 10) { - x = dx === 11 ? 9 : 11; - } - (this.images[x] || { - 9: reload, - 11: verify - }[x]).focus(); - e.preventDefault(); - return e.stopPropagation(); } }; @@ -9356,7 +9359,7 @@ return $.add(Gallery.nodes.thumbs, thumb); }, open: function(thumb) { - var el, elType, file, name, newID, nodes, oldID, post, ref, slideshow; + var el, elType, file, name, newID, nodes, oldID, post, slideshow; nodes = Gallery.nodes; name = nodes.name; oldID = +nodes.current.dataset.id; @@ -9396,8 +9399,8 @@ } else { Gallery.cb.stop(); } - if (Conf['Scroll to Post'] && (post = (ref = (post = g.posts[file.dataset.post])) != null ? ref.nodes.root : void 0)) { - Header.scrollTo(post); + if (Conf['Scroll to Post'] && (post = g.posts[file.dataset.post])) { + Header.scrollTo(post.nodes.root); } return nodes.thumbs.scrollTop = thumb.offsetTop + thumb.offsetHeight / 2 - nodes.thumbs.clientHeight / 2; }, diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 13caaed08..13516b5b4 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 ab2778b06..5a6d84f9d 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.13.3 +// @version 1.10.13.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 83f186936..234ec6b4b 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.13.3 +// @version 1.10.13.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.13.3', + VERSION: '1.10.13.4', NAMESPACE: '4chan X.', boards: {} }; @@ -7732,7 +7732,11 @@ } x = d.activeElement === verify ? 11 : 9; } - if (!(dx = { + if (e.keyCode === 32 && x < 9) { + this.images[x].click(); + e.preventDefault(); + return e.stopPropagation(); + } else if (dx = { 38: 9, 40: 3, 37: 11, @@ -7741,19 +7745,18 @@ 75: 3, 74: 11, 76: 1 - }[e.keyCode])) { - return; + }[e.keyCode]) { + x = (x + dx) % 12; + if (x === 10) { + x = dx === 11 ? 9 : 11; + } + (this.images[x] || { + 9: reload, + 11: verify + }[x]).focus(); + e.preventDefault(); + return e.stopPropagation(); } - x = (x + dx) % 12; - if (x === 10) { - x = dx === 11 ? 9 : 11; - } - (this.images[x] || { - 9: reload, - 11: verify - }[x]).focus(); - e.preventDefault(); - return e.stopPropagation(); } }; @@ -9357,7 +9360,7 @@ return $.add(Gallery.nodes.thumbs, thumb); }, open: function(thumb) { - var el, elType, file, name, newID, nodes, oldID, post, ref, slideshow; + var el, elType, file, name, newID, nodes, oldID, post, slideshow; nodes = Gallery.nodes; name = nodes.name; oldID = +nodes.current.dataset.id; @@ -9397,8 +9400,8 @@ } else { Gallery.cb.stop(); } - if (Conf['Scroll to Post'] && (post = (ref = (post = g.posts[file.dataset.post])) != null ? ref.nodes.root : void 0)) { - Header.scrollTo(post); + if (Conf['Scroll to Post'] && (post = g.posts[file.dataset.post])) { + Header.scrollTo(post.nodes.root); } return nodes.thumbs.scrollTop = thumb.offsetTop + thumb.offsetHeight / 2 - nodes.thumbs.clientHeight / 2; }, diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 598eb011b..7c86788b3 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 2ab62b815..f212732d8 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 23cb15950..0c1883313 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index ce7b278f6..0536544c3 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.13.3", - "date": "2015-06-04T02:56:03.644Z", + "version": "1.10.13.4", + "date": "2015-06-05T22:09:56.541Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",