diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b90d013..adeada1b4 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.12 +**v1.10.12.3** *(2015-05-09)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.3/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix some captcha-related bugs. + **v1.10.12.2** *(2015-05-08)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.12.2/builds/4chan-X-noupdate.crx "Chromium version")] - Fix sandboxed HTTP sauce links not loading from HTTPS pages. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index e6ccfdf40..3b194e93a 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 f9ea4dc8c..899e39a9a 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.2 +// @version 1.10.12.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 28b83c5cc..6e5845dec 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.2 +// @version 1.10.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.2', + VERSION: '1.10.12.3', NAMESPACE: '4chan X.', boards: {} }; @@ -8164,7 +8164,7 @@ if (!(this.isEnabled && (this.needed() || force))) { return; } - if (focus) { + if (focus && !QR.inBubble()) { this.shouldFocus = true; } if (this.timeouts.destroy) { @@ -8316,7 +8316,7 @@ this.captchas = this.captchas.slice(i); this.count(); $.set('captchas', this.captchas); - return this.setup(true); + return this.setup(d.activeElement === QR.nodes.status); }, count: function() { this.nodes.counter.textContent = "Captchas: " + this.captchas.length; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 429a95872..abee33177 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 d21eb55cd..e7f8eeac6 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.2 +// @version 1.10.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.2', + VERSION: '1.10.12.3', NAMESPACE: '4chan X.', boards: {} }; @@ -8163,7 +8163,7 @@ if (!(this.isEnabled && (this.needed() || force))) { return; } - if (focus) { + if (focus && !QR.inBubble()) { this.shouldFocus = true; } if (this.timeouts.destroy) { @@ -8315,7 +8315,7 @@ this.captchas = this.captchas.slice(i); this.count(); $.set('captchas', this.captchas); - return this.setup(true); + return this.setup(d.activeElement === QR.nodes.status); }, count: function() { this.nodes.counter.textContent = "Captchas: " + this.captchas.length; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 4dd18bfc4..a1e112726 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 832cb8ebf..0b404b12b 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.2 +// @version 1.10.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 551f3c3d9..e21e6e020 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.2 +// @version 1.10.12.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -396,7 +396,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.12.2', + VERSION: '1.10.12.3', NAMESPACE: '4chan X.', boards: {} }; @@ -8164,7 +8164,7 @@ if (!(this.isEnabled && (this.needed() || force))) { return; } - if (focus) { + if (focus && !QR.inBubble()) { this.shouldFocus = true; } if (this.timeouts.destroy) { @@ -8316,7 +8316,7 @@ this.captchas = this.captchas.slice(i); this.count(); $.set('captchas', this.captchas); - return this.setup(true); + return this.setup(d.activeElement === QR.nodes.status); }, count: function() { this.nodes.counter.textContent = "Captchas: " + this.captchas.length; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index ec745ebe7..e1acbd73c 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 94a543d10..16b4dab39 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 76187f770..ac55fa6c7 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 2fbae2e94..ec65fa756 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.2", - "date": "2015-05-09T02:24:39.395Z", + "version": "1.10.12.3", + "date": "2015-05-10T02:11:26.536Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",