Release 4chan X v1.13.9.1.

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### v1.13.9
 
+**v1.13.9.1** *(2017-04-23)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.1/builds/4chan-X-noupdate.crx)]
+- Fix captcha cleanup. #1341
+
 **v1.13.9.0** *(2017-04-16)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.0/builds/4chan-X-noupdate.crx)]
 - Based on v1.13.8.5.
 - Restore support for noscript fallback version of Recaptcha v1. Can be activated through new `Force Noscript Captcha for v1` option. Only working on HTTPS currently. If used, this will validate captchas before posting.

builds/4chan-X-beta.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.9.0
+// @version      1.13.9.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/4chan-X-beta.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.9.0
+// @version      1.13.9.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.0',
+  VERSION:   '1.13.9.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -6918,7 +6918,7 @@ Redirect = (function() {
     archives: [
       { "uid": 3, "name": "4plebs", "domain": "archive.4plebs.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "files": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "reports": true },
       { "uid": 4, "name": "Nyafuu Archive", "domain": "archive.nyafuu.org", "http": false, "https": true, "software": "foolfuuka", "boards": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "files": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "reports": true },
-      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ] },
+      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ], "reports": true },
       { "uid": 10, "name": "warosu", "domain": "warosu.org", "http": false, "https": true, "software": "fuuka", "boards": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ], "files": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ] },
       { "uid": 23, "name": "Desuarchive", "domain": "desuarchive.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "files": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "reports": true },
       { "uid": 24, "name": "fireden.net", "domain": "boards.fireden.net", "http": false, "https": true, "software": "foolfuuka", "boards": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ], "files": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ] },
@@ -20795,12 +20795,12 @@ Captcha = {};
       });
     },
     afterSetup: function(mutations) {
-      var iframe, j, k, len, len1, mutation, node, ref, textarea;
+      var i, iframe, j, len, len1, mutation, node, ref, textarea;
-      for (j = 0, len = mutations.length; j < len; j++) {
+      for (i = 0, len = mutations.length; i < len; i++) {
-        mutation = mutations[j];
+        mutation = mutations[i];
         ref = mutation.addedNodes;
-        for (k = 0, len1 = ref.length; k < len1; k++) {
+        for (j = 0, len1 = ref.length; j < len1; j++) {
-          node = ref[k];
+          node = ref[j];
           if ((iframe = $.x('./descendant-or-self::iframe', node))) {
             this.setupIFrame(iframe);
           }
@@ -20842,23 +20842,19 @@ Captcha = {};
       })(this));
     },
     destroy: function() {
-      var garbage, i, ins, node, ref;
       if (!this.isEnabled) {
         return;
       }
       delete this.timeouts.destroy;
       $.rmClass(QR.nodes.el, 'captcha-open');
       if (this.nodes.container) {
+        $.global(function() {
+          var container;
+          container = document.querySelector('#qr .captcha-container');
+          return window.grecaptcha.reset(container.dataset.widgetID);
+        });
         $.rm(this.nodes.container);
-      }
+        return delete this.nodes.container;
-      delete this.nodes.container;
-      garbage = $.X('//iframe[starts-with(@src, "https://www.google.com/recaptcha/api2/frame")]/ancestor-or-self::*[parent::body]');
-      i = 0;
-      while (node = garbage.snapshotItem(i++)) {
-        if (((ref = (ins = node.nextSibling)) != null ? ref.nodeName : void 0) === 'INS') {
-          $.rm(ins);
-        }
-        $.rm(node);
       }
     },
     getOne: function(isReply) {

builds/4chan-X-noupdate.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.9.0
+// @version      1.13.9.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.0',
+  VERSION:   '1.13.9.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -6918,7 +6918,7 @@ Redirect = (function() {
     archives: [
       { "uid": 3, "name": "4plebs", "domain": "archive.4plebs.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "files": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "reports": true },
       { "uid": 4, "name": "Nyafuu Archive", "domain": "archive.nyafuu.org", "http": false, "https": true, "software": "foolfuuka", "boards": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "files": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "reports": true },
-      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ] },
+      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ], "reports": true },
       { "uid": 10, "name": "warosu", "domain": "warosu.org", "http": false, "https": true, "software": "fuuka", "boards": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ], "files": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ] },
       { "uid": 23, "name": "Desuarchive", "domain": "desuarchive.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "files": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "reports": true },
       { "uid": 24, "name": "fireden.net", "domain": "boards.fireden.net", "http": false, "https": true, "software": "foolfuuka", "boards": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ], "files": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ] },
@@ -20795,12 +20795,12 @@ Captcha = {};
       });
     },
     afterSetup: function(mutations) {
-      var iframe, j, k, len, len1, mutation, node, ref, textarea;
+      var i, iframe, j, len, len1, mutation, node, ref, textarea;
-      for (j = 0, len = mutations.length; j < len; j++) {
+      for (i = 0, len = mutations.length; i < len; i++) {
-        mutation = mutations[j];
+        mutation = mutations[i];
         ref = mutation.addedNodes;
-        for (k = 0, len1 = ref.length; k < len1; k++) {
+        for (j = 0, len1 = ref.length; j < len1; j++) {
-          node = ref[k];
+          node = ref[j];
           if ((iframe = $.x('./descendant-or-self::iframe', node))) {
             this.setupIFrame(iframe);
           }
@@ -20842,23 +20842,19 @@ Captcha = {};
       })(this));
     },
     destroy: function() {
-      var garbage, i, ins, node, ref;
       if (!this.isEnabled) {
         return;
       }
       delete this.timeouts.destroy;
       $.rmClass(QR.nodes.el, 'captcha-open');
       if (this.nodes.container) {
+        $.global(function() {
+          var container;
+          container = document.querySelector('#qr .captcha-container');
+          return window.grecaptcha.reset(container.dataset.widgetID);
+        });
         $.rm(this.nodes.container);
-      }
+        return delete this.nodes.container;
-      delete this.nodes.container;
-      garbage = $.X('//iframe[starts-with(@src, "https://www.google.com/recaptcha/api2/frame")]/ancestor-or-self::*[parent::body]');
-      i = 0;
-      while (node = garbage.snapshotItem(i++)) {
-        if (((ref = (ins = node.nextSibling)) != null ? ref.nodeName : void 0) === 'INS') {
-          $.rm(ins);
-        }
-        $.rm(node);
       }
     },
     getOne: function(isReply) {

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.9.0
+// @version      1.13.9.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/4chan-X.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.9.0
+// @version      1.13.9.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.0',
+  VERSION:   '1.13.9.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -6918,7 +6918,7 @@ Redirect = (function() {
     archives: [
       { "uid": 3, "name": "4plebs", "domain": "archive.4plebs.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "files": [ "adv", "f", "hr", "mlpol", "mo", "o", "pol", "s4s", "sp", "tg", "trv", "tv", "x" ], "reports": true },
       { "uid": 4, "name": "Nyafuu Archive", "domain": "archive.nyafuu.org", "http": false, "https": true, "software": "foolfuuka", "boards": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "files": [ "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr" ], "reports": true },
-      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ] },
+      { "uid": 8, "name": "Rebecca Black Tech", "domain": "archive.rebeccablacktech.com", "http": false, "https": true, "software": "foolfuuka", "boards": [ "cgl", "g", "mu" ], "files": [ "cgl", "g", "mu" ], "reports": true },
       { "uid": 10, "name": "warosu", "domain": "warosu.org", "http": false, "https": true, "software": "fuuka", "boards": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ], "files": [ "3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr" ] },
       { "uid": 23, "name": "Desuarchive", "domain": "desuarchive.org", "http": true, "https": true, "software": "foolfuuka", "boards": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "files": [ "a", "aco", "an", "c", "co", "d", "fit", "gif", "his", "int", "k", "m", "mlp", "qa", "r9k", "tg", "trash", "vr", "wsg" ], "reports": true },
       { "uid": 24, "name": "fireden.net", "domain": "boards.fireden.net", "http": false, "https": true, "software": "foolfuuka", "boards": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ], "files": [ "a", "cm", "ic", "sci", "tg", "v", "vg", "y" ] },
@@ -20795,12 +20795,12 @@ Captcha = {};
       });
     },
     afterSetup: function(mutations) {
-      var iframe, j, k, len, len1, mutation, node, ref, textarea;
+      var i, iframe, j, len, len1, mutation, node, ref, textarea;
-      for (j = 0, len = mutations.length; j < len; j++) {
+      for (i = 0, len = mutations.length; i < len; i++) {
-        mutation = mutations[j];
+        mutation = mutations[i];
         ref = mutation.addedNodes;
-        for (k = 0, len1 = ref.length; k < len1; k++) {
+        for (j = 0, len1 = ref.length; j < len1; j++) {
-          node = ref[k];
+          node = ref[j];
           if ((iframe = $.x('./descendant-or-self::iframe', node))) {
             this.setupIFrame(iframe);
           }
@@ -20842,23 +20842,19 @@ Captcha = {};
       })(this));
     },
     destroy: function() {
-      var garbage, i, ins, node, ref;
       if (!this.isEnabled) {
         return;
       }
       delete this.timeouts.destroy;
       $.rmClass(QR.nodes.el, 'captcha-open');
       if (this.nodes.container) {
+        $.global(function() {
+          var container;
+          container = document.querySelector('#qr .captcha-container');
+          return window.grecaptcha.reset(container.dataset.widgetID);
+        });
         $.rm(this.nodes.container);
-      }
+        return delete this.nodes.container;
-      delete this.nodes.container;
-      garbage = $.X('//iframe[starts-with(@src, "https://www.google.com/recaptcha/api2/frame")]/ancestor-or-self::*[parent::body]');
-      i = 0;
-      while (node = garbage.snapshotItem(i++)) {
-        if (((ref = (ins = node.nextSibling)) != null ? ref.nodeName : void 0) === 'INS') {
-          $.rm(ins);
-        }
-        $.rm(node);
       }
     },
     getOne: function(isReply) {

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.13.9.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.9.1' />
   </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.13.9.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.9.1' />
   </app>
 </gupdate>
 

version.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.13.9.0",
+  "version": "1.13.9.1",
-  "date": "2017-04-16T02:19:54.529Z"
+  "date": "2017-04-23T01:03:49.649Z"
 }