diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7e24e5dd..fcdf10fea 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.1
+**v1.10.1.12** *(2015-02-20)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.12/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.12/builds/4chan-X-noupdate.crx "Chromium version")]
+- Work around new scrolling issue when tabbing into captcha on Chromium.
+
**v1.10.1.11** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.11/builds/4chan-X-noupdate.crx "Chromium version")]
- Merge v1.10.0.7: Work around more issues with clearing settings in Firefox 35+.
diff --git a/LICENSE b/LICENSE
index 1c84b1f0e..f9b6fad10 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.10.1.11
+* 4chan X - Version 1.10.1.12
*
* 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 0de8f2b96..e86928b26 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 52a4b04a0..91acbd03b 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.1.11
+// @version 1.10.1.12
// @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 623c0a903..a05288663 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.1.11
+// @version 1.10.1.12
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.11
+* 4chan X - Version 1.10.1.12
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -405,7 +405,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.1.11',
+ VERSION: '1.10.1.12',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6923,7 +6923,7 @@
return QR.captcha.destroy();
},
focus: function() {
- return $.queueTask(function() {
+ $.queueTask(function() {
var focus;
if (!QR.nodes) {
return;
@@ -6932,17 +6932,17 @@
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;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return $[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;
+ return $.on(d, 'scroll', QR.scrollLock);
+ } else {
+ return $.off(d, 'scroll', QR.scrollLock);
+ }
+ }
},
scrollLock: function() {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index cbddd42bd..1cae8eb4c 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 fe4a8c2ea..352862d92 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.1.11
+// @version 1.10.1.12
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.11
+* 4chan X - Version 1.10.1.12
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -404,7 +404,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.1.11',
+ VERSION: '1.10.1.12',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6922,7 +6922,7 @@
return QR.captcha.destroy();
},
focus: function() {
- return $.queueTask(function() {
+ $.queueTask(function() {
var focus;
if (!QR.nodes) {
return;
@@ -6931,17 +6931,17 @@
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;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return $[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;
+ return $.on(d, 'scroll', QR.scrollLock);
+ } else {
+ return $.off(d, 'scroll', QR.scrollLock);
+ }
+ }
},
scrollLock: function() {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 05015d167..4d7fb8698 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 1303e9564..45889a005 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.1.11
+// @version 1.10.1.12
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 97c9ba20f..13b832ef8 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.1.11
+// @version 1.10.1.12
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.11
+* 4chan X - Version 1.10.1.12
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -405,7 +405,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.1.11',
+ VERSION: '1.10.1.12',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -6923,7 +6923,7 @@
return QR.captcha.destroy();
},
focus: function() {
- return $.queueTask(function() {
+ $.queueTask(function() {
var focus;
if (!QR.nodes) {
return;
@@ -6932,17 +6932,17 @@
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;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return $[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;
+ return $.on(d, 'scroll', QR.scrollLock);
+ } else {
+ return $.off(d, 'scroll', QR.scrollLock);
+ }
+ }
},
scrollLock: function() {
if (d.activeElement && QR.nodes.el.contains(d.activeElement) && d.activeElement.nodeName === 'IFRAME') {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index f80304ca9..e96b1d1d2 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 4d76429de..3a5dc03fa 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 dd24039d3..e5ea667e8 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 10460aac2..3ef4ddf22 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.10.1.11",
+ "version": "1.10.1.12",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",