diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecf641ced..89fb77ad8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.18
+**v1.11.18.2** *(2015-11-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- The `Use Recaptcha v1` setting takes priority over `Force Noscript Captcha` again.
+
**v1.11.18.1** *(2015-11-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.18.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Shorten the text of some menu items and show the Alt/Shift+click shortcuts to watch/hide threads in the catalog thread menu.
- Minor bugfixes.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index c62876efc..f6b2bff6f 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 730af725d..4bd73a43b 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.18.1
+// @version 1.11.18.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 4aee115b5..c0a349d90 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.18.1
+// @version 1.11.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -245,7 +245,7 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
- 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha.'],
+ 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [true, 'Add a 4chan Pass login link to the bottom of the page.']
@@ -432,7 +432,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.18.1',
+ VERSION: '1.11.18.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6971,7 +6971,7 @@
if (g.VIEW === 'archive') {
return;
}
- version = Conf['Use Recaptcha v1'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled ? 'v1' : 'v2';
+ version = Conf['Use Recaptcha v1'] && Main.jsEnabled ? 'v1' : 'v2';
this.captcha = Captcha[version];
$.on(d, '4chanXInitFinished', this.initReady);
Post.callbacks.push({
@@ -8130,21 +8130,25 @@
Captcha.replace = {
init: function() {
+ var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
- if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
- $.ready(Captcha.replace.noscript);
- return;
- }
- if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
- $.ready(Captcha.replace.v2);
+ if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
+ if (Conf['Use Recaptcha v2 in Reports']) {
+ type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
+ $.ready(Captcha.replace[type]);
+ }
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
$.ready(Captcha.replace.v1);
return;
}
+ if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
+ $.ready(Captcha.replace.noscript);
+ return;
+ }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') {
return $.onExists(doc, '#captchaFormPart', true, function(node) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index be44e795f..149a02a61 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 0d9740927..6a7338912 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.18.1
+// @version 1.11.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -245,7 +245,7 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
- 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha.'],
+ 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [true, 'Add a 4chan Pass login link to the bottom of the page.']
@@ -432,7 +432,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.18.1',
+ VERSION: '1.11.18.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6971,7 +6971,7 @@
if (g.VIEW === 'archive') {
return;
}
- version = Conf['Use Recaptcha v1'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled ? 'v1' : 'v2';
+ version = Conf['Use Recaptcha v1'] && Main.jsEnabled ? 'v1' : 'v2';
this.captcha = Captcha[version];
$.on(d, '4chanXInitFinished', this.initReady);
Post.callbacks.push({
@@ -8130,21 +8130,25 @@
Captcha.replace = {
init: function() {
+ var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
- if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
- $.ready(Captcha.replace.noscript);
- return;
- }
- if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
- $.ready(Captcha.replace.v2);
+ if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
+ if (Conf['Use Recaptcha v2 in Reports']) {
+ type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
+ $.ready(Captcha.replace[type]);
+ }
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
$.ready(Captcha.replace.v1);
return;
}
+ if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
+ $.ready(Captcha.replace.noscript);
+ return;
+ }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') {
return $.onExists(doc, '#captchaFormPart', true, function(node) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index d218708d2..5ca0e3b5b 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 209e9ab37..249288661 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.18.1
+// @version 1.11.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index b828a98a6..c54cb9325 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.18.1
+// @version 1.11.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -245,7 +245,7 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
- 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha.'],
+ 'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [true, 'Add a 4chan Pass login link to the bottom of the page.']
@@ -432,7 +432,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.18.1',
+ VERSION: '1.11.18.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6971,7 +6971,7 @@
if (g.VIEW === 'archive') {
return;
}
- version = Conf['Use Recaptcha v1'] && !Conf['Force Noscript Captcha'] && Main.jsEnabled ? 'v1' : 'v2';
+ version = Conf['Use Recaptcha v1'] && Main.jsEnabled ? 'v1' : 'v2';
this.captcha = Captcha[version];
$.on(d, '4chanXInitFinished', this.initReady);
Post.callbacks.push({
@@ -8130,21 +8130,25 @@
Captcha.replace = {
init: function() {
+ var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
- if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
- $.ready(Captcha.replace.noscript);
- return;
- }
- if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
- $.ready(Captcha.replace.v2);
+ if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
+ if (Conf['Use Recaptcha v2 in Reports']) {
+ type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
+ $.ready(Captcha.replace[type]);
+ }
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
$.ready(Captcha.replace.v1);
return;
}
+ if (Conf['Force Noscript Captcha'] && Main.jsEnabled) {
+ $.ready(Captcha.replace.noscript);
+ return;
+ }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') {
return $.onExists(doc, '#captchaFormPart', true, function(node) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index c0da3a80d..4b3aa8ca9 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 61f8f8a1e..88e532450 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 a2498dfe2..035e44fe1 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 1462e9819..978679677 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.11.18.1",
- "date": "2015-11-23T02:19:39.661Z"
+ "version": "1.11.18.2",
+ "date": "2015-11-24T06:48:15.178Z"
}