diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31301ddaf..066399cbf 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.13
+**v1.10.13.2** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.12.9: Update for captcha changes.
+- Merge v1.10.12.9: Work around issue where the captcha causes scrolling to the top of the page.
+
**v1.10.13.1** *(2015-05-27)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix manual page number updating not working when `Updater and Stats in Header` is off.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 2ba5f9e95..9e28c33ed 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 8bbc03024..99d89d0a4 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.1
+// @version 1.10.13.2
// @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 482f76d67..42202a762 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.1
+// @version 1.10.13.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.1',
+ VERSION: '1.10.13.2',
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;
@@ -8165,6 +8164,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 7c6180b80..0ed2d0016 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 9beaa6fc3..26241f68b 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.1
+// @version 1.10.13.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.1',
+ VERSION: '1.10.13.2',
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;
@@ -8164,6 +8163,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 20bb17ce7..84c136995 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 74d907f89..00b2589fa 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.1
+// @version 1.10.13.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 89454187d..61b49a0a3 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.1
+// @version 1.10.13.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.1',
+ VERSION: '1.10.13.2',
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;
@@ -8165,6 +8164,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 3ff76e312..25ea9a87c 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 c023a5666..046ad84c1 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 386dcb98a..85cbcb996 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 4281932db..7ad6648bf 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.1",
- "date": "2015-05-27T18:54:32.769Z",
+ "version": "1.10.13.2",
+ "date": "2015-06-04T01:35:08.056Z",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",