Release 4chan X v1.11.18.2.

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.

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

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) {
+      if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
-        $.ready(Captcha.replace.noscript);
+        if (Conf['Use Recaptcha v2 in Reports']) {
-        return;
+          type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
-      }
+          $.ready(Captcha.replace[type]);
-      if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
+        }
-        $.ready(Captcha.replace.v2);
         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) {

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) {
+      if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
-        $.ready(Captcha.replace.noscript);
+        if (Conf['Use Recaptcha v2 in Reports']) {
-        return;
+          type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
-      }
+          $.ready(Captcha.replace[type]);
-      if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
+        }
-        $.ready(Captcha.replace.v2);
         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) {

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

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) {
+      if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
-        $.ready(Captcha.replace.noscript);
+        if (Conf['Use Recaptcha v2 in Reports']) {
-        return;
+          type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
-      }
+          $.ready(Captcha.replace[type]);
-      if (location.hostname === 'sys.4chan.org' && Conf['Use Recaptcha v2 in Reports'] && Main.jsEnabled) {
+        }
-        $.ready(Captcha.replace.v2);
         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) {

builds/updates-beta.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.18.1' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.18.2' />
   </app>
 </gupdate>
 

builds/updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.18.1' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.18.2' />
   </app>
 </gupdate>
 

version.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.11.18.1",
+  "version": "1.11.18.2",
-  "date": "2015-11-23T02:19:39.661Z"
+  "date": "2015-11-24T06:48:15.178Z"
 }