diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a8eba8dd..31eaec223 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.16
+**v1.11.16.1** *(2015-11-09)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.16.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.16.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Remove the hopefully no longer necessary measure of preventing all scrolling while the captcha is focused.
+
**v1.11.16.0** *(2015-11-08)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.16.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.16.0/builds/4chan-X-noupdate.crx "Chromium version")]
- Based on v1.11.15.7.
- 4chan X no longer requires local storage to be enabled when using Chromium-based browsers. In Firefox, local storage is still needed to sync settings between tabs, but it is no longer essential. Warnings about local storage being disabled can be turned off by disabling the `Show Support Message` setting. Local storage is still required in userscript engines that do not support the Greasemonkey API.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index e2db2bc81..68d7e7081 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 144978095..53e2f371f 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.16.0
+// @version 1.11.16.1
// @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 04eb0fb69..d9962b028 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.16.0
+// @version 1.11.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.16.0',
+ VERSION: '1.11.16.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7101,15 +7101,7 @@
return $.queueTask(function() {
if (!QR.inBubble()) {
QR.hasFocus = d.activeElement && QR.nodes.el.contains(d.activeElement);
- QR.nodes.el.classList.toggle('focus', QR.hasFocus);
- }
- if (QR.captcha.isEnabled && QR.captcha === Captcha.v2 && !QR.captcha.noscript) {
- if (QR.inCaptcha()) {
- QR.scrollY = window.scrollY;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return QR.nodes.el.classList.toggle('focus', QR.hasFocus);
}
});
},
@@ -7120,17 +7112,6 @@
return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
- inCaptcha: function() {
- var ref;
- return (((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && QR.nodes.el.contains(d.activeElement)) || (QR.hasFocus && QR.inBubble());
- },
- scrollLock: function() {
- if (QR.inCaptcha()) {
- return window.scroll(window.scrollX, QR.scrollY);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
- },
hide: function() {
d.activeElement.blur();
$.addClass(QR.nodes.el, 'autohide');
@@ -8764,7 +8745,7 @@
}
},
watchBubbles: function(mutations) {
- var k, len1, mutation, node, overlay, results;
+ var k, len1, mutation, node, results;
results = [];
for (k = 0, len1 = mutations.length; k < len1; k++) {
mutation = mutations[k];
@@ -8775,17 +8756,9 @@
for (q = 0, len2 = ref.length; q < len2; q++) {
node = ref[q];
if ($('iframe[src^="https://www.google.com/recaptcha/api2/frame"]', node)) {
- new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
+ results1.push(new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
attributes: true
- });
- if (overlay = $('div[style*="position: fixed;"]', node)) {
- results1.push($.on(overlay, 'click', function() {
- var ref1;
- return (ref1 = $('#qr iframe')) != null ? ref1.blur() : void 0;
- }));
- } else {
- results1.push(void 0);
- }
+ }));
} else {
results1.push(void 0);
}
@@ -19772,9 +19745,19 @@
"#qr .captcha-root {\n" +
" position: relative;\n" +
"}\n" +
-"#qr .captcha-container > div > div {\n" +
+"#qr .captcha-container > div {\n" +
" margin: auto;\n" +
"}\n" +
+"/* scrollable with scroll bar hidden; prevents scroll on space press */\n" +
+":root.blink #qr .captcha-container > div {\n" +
+" width: 304px;\n" +
+" overflow: hidden;\n" +
+"}\n" +
+":root.blink #qr .captcha-container > div > div:first-of-type {\n" +
+" overflow-y: scroll;\n" +
+" overflow-x: hidden;\n" +
+" padding-right: 15px;\n" +
+"}\n" +
"#qr .captcha-counter {\n" +
" display: block;\n" +
" width: 100%;\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 8e74cd8ad..b8219496b 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 8fc25917c..cb5a02ea8 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.16.0
+// @version 1.11.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.16.0',
+ VERSION: '1.11.16.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7101,15 +7101,7 @@
return $.queueTask(function() {
if (!QR.inBubble()) {
QR.hasFocus = d.activeElement && QR.nodes.el.contains(d.activeElement);
- QR.nodes.el.classList.toggle('focus', QR.hasFocus);
- }
- if (QR.captcha.isEnabled && QR.captcha === Captcha.v2 && !QR.captcha.noscript) {
- if (QR.inCaptcha()) {
- QR.scrollY = window.scrollY;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return QR.nodes.el.classList.toggle('focus', QR.hasFocus);
}
});
},
@@ -7120,17 +7112,6 @@
return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
- inCaptcha: function() {
- var ref;
- return (((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && QR.nodes.el.contains(d.activeElement)) || (QR.hasFocus && QR.inBubble());
- },
- scrollLock: function() {
- if (QR.inCaptcha()) {
- return window.scroll(window.scrollX, QR.scrollY);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
- },
hide: function() {
d.activeElement.blur();
$.addClass(QR.nodes.el, 'autohide');
@@ -8764,7 +8745,7 @@
}
},
watchBubbles: function(mutations) {
- var k, len1, mutation, node, overlay, results;
+ var k, len1, mutation, node, results;
results = [];
for (k = 0, len1 = mutations.length; k < len1; k++) {
mutation = mutations[k];
@@ -8775,17 +8756,9 @@
for (q = 0, len2 = ref.length; q < len2; q++) {
node = ref[q];
if ($('iframe[src^="https://www.google.com/recaptcha/api2/frame"]', node)) {
- new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
+ results1.push(new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
attributes: true
- });
- if (overlay = $('div[style*="position: fixed;"]', node)) {
- results1.push($.on(overlay, 'click', function() {
- var ref1;
- return (ref1 = $('#qr iframe')) != null ? ref1.blur() : void 0;
- }));
- } else {
- results1.push(void 0);
- }
+ }));
} else {
results1.push(void 0);
}
@@ -19772,9 +19745,19 @@
"#qr .captcha-root {\n" +
" position: relative;\n" +
"}\n" +
-"#qr .captcha-container > div > div {\n" +
+"#qr .captcha-container > div {\n" +
" margin: auto;\n" +
"}\n" +
+"/* scrollable with scroll bar hidden; prevents scroll on space press */\n" +
+":root.blink #qr .captcha-container > div {\n" +
+" width: 304px;\n" +
+" overflow: hidden;\n" +
+"}\n" +
+":root.blink #qr .captcha-container > div > div:first-of-type {\n" +
+" overflow-y: scroll;\n" +
+" overflow-x: hidden;\n" +
+" padding-right: 15px;\n" +
+"}\n" +
"#qr .captcha-counter {\n" +
" display: block;\n" +
" width: 100%;\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 2e8e34052..4c66b9491 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 a6623be25..f9f1d88ce 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.16.0
+// @version 1.11.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index feeee7347..75fa4ac97 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.16.0
+// @version 1.11.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -433,7 +433,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.16.0',
+ VERSION: '1.11.16.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7101,15 +7101,7 @@
return $.queueTask(function() {
if (!QR.inBubble()) {
QR.hasFocus = d.activeElement && QR.nodes.el.contains(d.activeElement);
- QR.nodes.el.classList.toggle('focus', QR.hasFocus);
- }
- if (QR.captcha.isEnabled && QR.captcha === Captcha.v2 && !QR.captcha.noscript) {
- if (QR.inCaptcha()) {
- QR.scrollY = window.scrollY;
- return $.on(d, 'scroll', QR.scrollLock);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
+ return QR.nodes.el.classList.toggle('focus', QR.hasFocus);
}
});
},
@@ -7120,17 +7112,6 @@
return getComputedStyle(el).visibility !== 'hidden' && el.getBoundingClientRect().bottom > 0;
});
},
- inCaptcha: function() {
- var ref;
- return (((ref = d.activeElement) != null ? ref.nodeName : void 0) === 'IFRAME' && QR.nodes.el.contains(d.activeElement)) || (QR.hasFocus && QR.inBubble());
- },
- scrollLock: function() {
- if (QR.inCaptcha()) {
- return window.scroll(window.scrollX, QR.scrollY);
- } else {
- return $.off(d, 'scroll', QR.scrollLock);
- }
- },
hide: function() {
d.activeElement.blur();
$.addClass(QR.nodes.el, 'autohide');
@@ -8764,7 +8745,7 @@
}
},
watchBubbles: function(mutations) {
- var k, len1, mutation, node, overlay, results;
+ var k, len1, mutation, node, results;
results = [];
for (k = 0, len1 = mutations.length; k < len1; k++) {
mutation = mutations[k];
@@ -8775,17 +8756,9 @@
for (q = 0, len2 = ref.length; q < len2; q++) {
node = ref[q];
if ($('iframe[src^="https://www.google.com/recaptcha/api2/frame"]', node)) {
- new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
+ results1.push(new MutationObserver(this.fixBubble.bind(this, node)).observe(node, {
attributes: true
- });
- if (overlay = $('div[style*="position: fixed;"]', node)) {
- results1.push($.on(overlay, 'click', function() {
- var ref1;
- return (ref1 = $('#qr iframe')) != null ? ref1.blur() : void 0;
- }));
- } else {
- results1.push(void 0);
- }
+ }));
} else {
results1.push(void 0);
}
@@ -19772,9 +19745,19 @@
"#qr .captcha-root {\n" +
" position: relative;\n" +
"}\n" +
-"#qr .captcha-container > div > div {\n" +
+"#qr .captcha-container > div {\n" +
" margin: auto;\n" +
"}\n" +
+"/* scrollable with scroll bar hidden; prevents scroll on space press */\n" +
+":root.blink #qr .captcha-container > div {\n" +
+" width: 304px;\n" +
+" overflow: hidden;\n" +
+"}\n" +
+":root.blink #qr .captcha-container > div > div:first-of-type {\n" +
+" overflow-y: scroll;\n" +
+" overflow-x: hidden;\n" +
+" padding-right: 15px;\n" +
+"}\n" +
"#qr .captcha-counter {\n" +
" display: block;\n" +
" width: 100%;\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 8f6ff0060..d5d5ac92d 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 3a4ed91f1..08d6404b7 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 f89e98069..9271eb943 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index bd8acc742..3191120e8 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.11.16.0",
- "date": "2015-11-09T05:06:57.649Z"
+ "version": "1.11.16.1",
+ "date": "2015-11-09T10:10:15.190Z"
}