diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9732b0cff..391325d36 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.14
+**v1.11.14.8** *(2015-10-30)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.8/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.13.12: Update for captcha changes.
+
**v1.11.14.7** *(2015-10-30)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.14.7/builds/4chan-X-noupdate.crx "Chromium version")]
- Merge v1.11.13.11: Work around captcha bug causing captcha to go offscreen to the right.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 3c5cb3b75..667569f0b 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 71619f3e8..7de4fae8d 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.11.14.7
+// @version 1.11.14.8
// @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 15fd3ecda..f1226b823 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.11.14.7
+// @version 1.11.14.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -414,7 +414,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.14.7',
+ VERSION: '1.11.14.8',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7062,7 +7062,7 @@
var bubbles, ref;
bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]');
return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) {
- return el.getBoundingClientRect().bottom > 0;
+ return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
inCaptcha: function() {
@@ -8730,7 +8730,7 @@
fixBubble: function(node) {
var bottom, newLeft, qrLeft, ref, right, width;
ref = node.getBoundingClientRect(), bottom = ref.bottom, right = ref.right, width = ref.width;
- if (bottom > 0 && right > doc.clientWidth) {
+ if (getComputedStyle(node).visibility !== 'hidden' && bottom > 0 && right > doc.clientWidth) {
qrLeft = QR.nodes.el.getBoundingClientRect().left;
newLeft = Math.max(0, qrLeft - width);
return node.style.left = newLeft + "px";
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 65d92a6cf..bde8abdf4 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 694f39675..0b16a4c55 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.11.14.7
+// @version 1.11.14.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -414,7 +414,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.14.7',
+ VERSION: '1.11.14.8',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7062,7 +7062,7 @@
var bubbles, ref;
bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]');
return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) {
- return el.getBoundingClientRect().bottom > 0;
+ return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
inCaptcha: function() {
@@ -8730,7 +8730,7 @@
fixBubble: function(node) {
var bottom, newLeft, qrLeft, ref, right, width;
ref = node.getBoundingClientRect(), bottom = ref.bottom, right = ref.right, width = ref.width;
- if (bottom > 0 && right > doc.clientWidth) {
+ if (getComputedStyle(node).visibility !== 'hidden' && bottom > 0 && right > doc.clientWidth) {
qrLeft = QR.nodes.el.getBoundingClientRect().left;
newLeft = Math.max(0, qrLeft - width);
return node.style.left = newLeft + "px";
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 778e686d3..2317db850 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 36b970996..d73f9749f 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.14.7
+// @version 1.11.14.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index d9b6fe1a9..096ae172c 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.11.14.7
+// @version 1.11.14.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -414,7 +414,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.14.7',
+ VERSION: '1.11.14.8',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7062,7 +7062,7 @@
var bubbles, ref;
bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]');
return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) {
- return el.getBoundingClientRect().bottom > 0;
+ return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
inCaptcha: function() {
@@ -8730,7 +8730,7 @@
fixBubble: function(node) {
var bottom, newLeft, qrLeft, ref, right, width;
ref = node.getBoundingClientRect(), bottom = ref.bottom, right = ref.right, width = ref.width;
- if (bottom > 0 && right > doc.clientWidth) {
+ if (getComputedStyle(node).visibility !== 'hidden' && bottom > 0 && right > doc.clientWidth) {
qrLeft = QR.nodes.el.getBoundingClientRect().left;
newLeft = Math.max(0, qrLeft - width);
return node.style.left = newLeft + "px";
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 9abcc4181..58ed8a454 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 bb600c7ab..f98a74935 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 f3c6e7eee..9a39f9191 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index af2be756f..def2e4a58 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
"meta": {
"name": "4chan X",
"fork": "ccd0",
- "version": "1.11.14.7",
- "date": "2015-10-30T16:29:22.951Z",
+ "version": "1.11.14.8",
+ "date": "2015-10-30T19:17:13.622Z",
"page": "https://www.4chan-x.net/",
"downloads": "https://www.4chan-x.net/builds/",
"oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",