Release 4chan X v1.9.17.1.

CHANGELOG.md

@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
 The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
 
 <!-- v1.9.17.x -->
+### v1.9.17.1 
+*2014-12-23* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.1/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Fix double loading of captcha image when using `<noscript>` captcha.
+
 ### v1.9.17.0 
 *2014-12-22* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.0/builds/4chan-X-noupdate.crx "Chromium version")]
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.17.0
+* 4chan X - Version 1.9.17.1
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE

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

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.9.17.0
+// @version      1.9.17.1
 // @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.9.17.0
+// @version      1.9.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.17.0
+* 4chan X - Version 1.9.17.1
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -393,7 +393,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.17.0',
+    VERSION: '1.9.17.1',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -7562,23 +7562,8 @@
       return this.setup();
     },
     initFrame: function() {
-      var conn, img, sendChallenge, _ref, _ref1;
+      var cb, conn, img, _ref, _ref1;
-      img = $('.fbc-payload > img');
-      sendChallenge = function() {
-        if (img.complete) {
-          return conn.send({
-            challenge: img.src
-          });
-        } else {
-          return $.on(img, 'load', function() {
-            return conn.send({
-              challenge: img.src
-            });
-          });
-        }
-      };
       conn = new Connection(window.top, "" + location.protocol + "//boards.4chan.org", {
-        queryChallenge: sendChallenge,
         response: function(response) {
           $.id('response').value = response;
           return $('.fbc-challenge > form').submit();
@@ -7588,8 +7573,23 @@
         token: (_ref = $('.fbc-verification-token > textarea')) != null ? _ref.value : void 0,
         error: (_ref1 = $('.fbc-error')) != null ? _ref1.textContent : void 0
       });
-      if (img) {
+      if (!(img = $('.fbc-payload > img'))) {
-        return sendChallenge();
+        return;
+      }
+      cb = function() {
+        var canvas;
+        canvas = $.el('canvas');
+        canvas.width = img.width;
+        canvas.height = img.height;
+        canvas.getContext('2d').drawImage(img, 0, 0);
+        return conn.send({
+          challenge: canvas.toDataURL()
+        });
+      };
+      if (img.complete) {
+        return cb();
+      } else {
+        return $.on(img, 'load', cb);
       }
     },
     timers: {},
@@ -14572,7 +14572,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.0</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.1</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);

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

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.17.0
+// @version      1.9.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.17.0
+* 4chan X - Version 1.9.17.1
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -392,7 +392,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.17.0',
+    VERSION: '1.9.17.1',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -7561,23 +7561,8 @@
       return this.setup();
     },
     initFrame: function() {
-      var conn, img, sendChallenge, _ref, _ref1;
+      var cb, conn, img, _ref, _ref1;
-      img = $('.fbc-payload > img');
-      sendChallenge = function() {
-        if (img.complete) {
-          return conn.send({
-            challenge: img.src
-          });
-        } else {
-          return $.on(img, 'load', function() {
-            return conn.send({
-              challenge: img.src
-            });
-          });
-        }
-      };
       conn = new Connection(window.top, "" + location.protocol + "//boards.4chan.org", {
-        queryChallenge: sendChallenge,
         response: function(response) {
           $.id('response').value = response;
           return $('.fbc-challenge > form').submit();
@@ -7587,8 +7572,23 @@
         token: (_ref = $('.fbc-verification-token > textarea')) != null ? _ref.value : void 0,
         error: (_ref1 = $('.fbc-error')) != null ? _ref1.textContent : void 0
       });
-      if (img) {
+      if (!(img = $('.fbc-payload > img'))) {
-        return sendChallenge();
+        return;
+      }
+      cb = function() {
+        var canvas;
+        canvas = $.el('canvas');
+        canvas.width = img.width;
+        canvas.height = img.height;
+        canvas.getContext('2d').drawImage(img, 0, 0);
+        return conn.send({
+          challenge: canvas.toDataURL()
+        });
+      };
+      if (img.complete) {
+        return cb();
+      } else {
+        return $.on(img, 'load', cb);
       }
     },
     timers: {},
@@ -14571,7 +14571,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.0</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.1</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.17.0
+// @version      1.9.17.1
 // @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.9.17.0
+// @version      1.9.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.9.17.0
+* 4chan X - Version 1.9.17.1
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -393,7 +393,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.9.17.0',
+    VERSION: '1.9.17.1',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -7562,23 +7562,8 @@
       return this.setup();
     },
     initFrame: function() {
-      var conn, img, sendChallenge, _ref, _ref1;
+      var cb, conn, img, _ref, _ref1;
-      img = $('.fbc-payload > img');
-      sendChallenge = function() {
-        if (img.complete) {
-          return conn.send({
-            challenge: img.src
-          });
-        } else {
-          return $.on(img, 'load', function() {
-            return conn.send({
-              challenge: img.src
-            });
-          });
-        }
-      };
       conn = new Connection(window.top, "" + location.protocol + "//boards.4chan.org", {
-        queryChallenge: sendChallenge,
         response: function(response) {
           $.id('response').value = response;
           return $('.fbc-challenge > form').submit();
@@ -7588,8 +7573,23 @@
         token: (_ref = $('.fbc-verification-token > textarea')) != null ? _ref.value : void 0,
         error: (_ref1 = $('.fbc-error')) != null ? _ref1.textContent : void 0
       });
-      if (img) {
+      if (!(img = $('.fbc-payload > img'))) {
-        return sendChallenge();
+        return;
+      }
+      cb = function() {
+        var canvas;
+        canvas = $.el('canvas');
+        canvas.width = img.width;
+        canvas.height = img.height;
+        canvas.getContext('2d').drawImage(img, 0, 0);
+        return conn.send({
+          challenge: canvas.toDataURL()
+        });
+      };
+      if (img.complete) {
+        return cb();
+      } else {
+        return $.on(img, 'load', cb);
       }
     },
     timers: {},
@@ -14572,7 +14572,7 @@
         className: 'dialog'
       });
       $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.0</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.17.1</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
       });
       $.on($('.export', Settings.dialog), 'click', Settings["export"]);
       $.on($('.import', Settings.dialog), 'click', Settings["import"]);

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://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.17.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.17.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://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.17.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.17.1' />
   </app>
 </gupdate>
 

package.json

@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.9.17.0",
+    "version": "1.9.17.1",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",