diff --git a/CHANGELOG.md b/CHANGELOG.md index 08fc56d3a..ef26a42c7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.27 +*2014-05-02* + **ccd0** - Update due to more Recaptcha changes. diff --git a/LICENSE b/LICENSE index eba21f009..bd456eab6 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.26 - 2014-05-02 +* 4chan X - Version 1.7.27 - 2014-05-02 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index cccadddf1..37163a9bf 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.26 +// @version 1.7.27 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 1c188230a..a50f1c569 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.7.26 +// @version 1.7.27 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.26 - 2014-05-02 +* 4chan X - Version 1.7.27 - 2014-05-02 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -372,7 +372,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.26', + VERSION: '1.7.27', NAMESPACE: '4chan X.', boards: {} }; @@ -6658,6 +6658,9 @@ return QR.captcha.clear(); }); $.sync('captchas', this.sync); + new MutationObserver(this.afterSetup).observe($.id('captchaContainer'), { + childList: true + }); this.beforeSetup(); return this.afterSetup(); }, @@ -6668,11 +6671,7 @@ input.value = ''; input.placeholder = 'Focus to load reCAPTCHA'; this.count(); - $.on(input, 'focus', this.setup); - this.setupObserver = new MutationObserver(this.afterSetup); - return this.setupObserver.observe($.id('captchaContainer'), { - childList: true - }); + return $.on(input, 'focus', this.setup); }, setup: function() { return $.globalEval('loadRecaptcha()'); @@ -6682,8 +6681,9 @@ if (!(challenge = $.id('recaptcha_challenge_field_holder'))) { return; } - QR.captcha.setupObserver.disconnect(); - delete QR.captcha.setupObserver; + if (challenge === QR.captcha.nodes.challenge) { + return; + } setLifetime = function(e) { return QR.captcha.lifetime = e.detail; }; diff --git a/builds/crx.crx b/builds/crx.crx index 29a434b89..9aa27ac92 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index ca9f42587..c427a143c 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.26", + "version": "1.7.27", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index b0fde81de..40bfc8ea6 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.26 - 2014-05-02 +* 4chan X - Version 1.7.27 - 2014-05-02 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -348,7 +348,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.26', + VERSION: '1.7.27', NAMESPACE: '4chan X.', boards: {} }; @@ -6683,6 +6683,9 @@ return QR.captcha.clear(); }); $.sync('captchas', this.sync); + new MutationObserver(this.afterSetup).observe($.id('captchaContainer'), { + childList: true + }); this.beforeSetup(); return this.afterSetup(); }, @@ -6693,11 +6696,7 @@ input.value = ''; input.placeholder = 'Focus to load reCAPTCHA'; this.count(); - $.on(input, 'focus', this.setup); - this.setupObserver = new MutationObserver(this.afterSetup); - return this.setupObserver.observe($.id('captchaContainer'), { - childList: true - }); + return $.on(input, 'focus', this.setup); }, setup: function() { return $.globalEval('loadRecaptcha()'); @@ -6707,8 +6706,9 @@ if (!(challenge = $.id('recaptcha_challenge_field_holder'))) { return; } - QR.captcha.setupObserver.disconnect(); - delete QR.captcha.setupObserver; + if (challenge === QR.captcha.nodes.challenge) { + return; + } setLifetime = function(e) { return QR.captcha.lifetime = e.detail; }; diff --git a/builds/updates.xml b/builds/updates.xml index 26a2b8df4..e4881e51d 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 1aaa5ff7c..eff59893c 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.26", + "version": "1.7.27", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",