diff --git a/CHANGELOG.md b/CHANGELOG.md
index df803808f..b4f1840ba 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
+### v1.9.17.9
+*2014-12-26* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.9/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Fix some QR showing/hiding bugs.
+
### v1.9.17.8
*2014-12-25* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.8/builds/4chan-X-noupdate.crx "Chromium version")]
diff --git a/LICENSE b/LICENSE
index de599af46..af74a3ba3 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.17.8
+* 4chan X - Version 1.9.17.9
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index b5caa03ca..1bdb9d528 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 739e2a976..00b2f3b72 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.9.17.8
+// @version 1.9.17.9
// @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 0cea42417..8fce28b69 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.9.17.8
+// @version 1.9.17.9
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.17.8
+* 4chan X - Version 1.9.17.9
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -393,7 +393,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.17.8',
+ VERSION: '1.9.17.9',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6550,6 +6550,7 @@
$.on(d, '4chanXInitFinished', this.initReady);
window.addEventListener('focus', this.focus, true);
window.addEventListener('blur', this.focus, true);
+ $.on(d, 'click', this.focus);
return Post.callbacks.push({
name: 'Quick Reply',
cb: this.node
@@ -6677,8 +6678,12 @@
if (!QR.nodes) {
return;
}
- focus = d.activeElement && (QR.nodes.el.contains(d.activeElement) || d.activeElement.nodeName === 'IFRAME' && /^https:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src));
- $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ if (!$$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().top >= 0;
+ })) {
+ focus = d.activeElement && QR.nodes.el.contains(d.activeElement);
+ $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ }
if (typeof chrome !== "undefined" && chrome !== null) {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
QR.scrollY = window.scrollY;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 17b14b48c..519c116ba 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 0f81c8c15..0d526b31f 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.9.17.8
+// @version 1.9.17.9
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.17.8
+* 4chan X - Version 1.9.17.9
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -392,7 +392,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.17.8',
+ VERSION: '1.9.17.9',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6549,6 +6549,7 @@
$.on(d, '4chanXInitFinished', this.initReady);
window.addEventListener('focus', this.focus, true);
window.addEventListener('blur', this.focus, true);
+ $.on(d, 'click', this.focus);
return Post.callbacks.push({
name: 'Quick Reply',
cb: this.node
@@ -6676,8 +6677,12 @@
if (!QR.nodes) {
return;
}
- focus = d.activeElement && (QR.nodes.el.contains(d.activeElement) || d.activeElement.nodeName === 'IFRAME' && /^https:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src));
- $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ if (!$$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().top >= 0;
+ })) {
+ focus = d.activeElement && QR.nodes.el.contains(d.activeElement);
+ $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ }
if (typeof chrome !== "undefined" && chrome !== null) {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
QR.scrollY = window.scrollY;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 4be938a51..4ea26c1ba 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 2bfdb3b9e..11596e3dc 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.17.8
+// @version 1.9.17.9
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 92a78de5f..769a76859 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.9.17.8
+// @version 1.9.17.9
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.17.8
+* 4chan X - Version 1.9.17.9
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -393,7 +393,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.17.8',
+ VERSION: '1.9.17.9',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6550,6 +6550,7 @@
$.on(d, '4chanXInitFinished', this.initReady);
window.addEventListener('focus', this.focus, true);
window.addEventListener('blur', this.focus, true);
+ $.on(d, 'click', this.focus);
return Post.callbacks.push({
name: 'Quick Reply',
cb: this.node
@@ -6677,8 +6678,12 @@
if (!QR.nodes) {
return;
}
- focus = d.activeElement && (QR.nodes.el.contains(d.activeElement) || d.activeElement.nodeName === 'IFRAME' && /^https:\/\/www\.google\.com\/recaptcha\//.test(d.activeElement.src));
- $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ if (!$$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().top >= 0;
+ })) {
+ focus = d.activeElement && QR.nodes.el.contains(d.activeElement);
+ $[focus ? 'addClass' : 'rmClass'](QR.nodes.el, 'focus');
+ }
if (typeof chrome !== "undefined" && chrome !== null) {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
QR.scrollY = window.scrollY;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 9b0e2b5c9..930e57ec8 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 9b88c12a4..84db6c410 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 75dd7181e..7c4107d02 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 4ef46171d..bb4d646f6 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.9.17.8",
+ "version": "1.9.17.9",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",