diff --git a/CHANGELOG.md b/CHANGELOG.md index 898bb9f00..85d68137d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.13 +**v1.11.13.7** *(2015-10-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.7/builds/4chan-X-noupdate.crx "Chromium version")] +- Update for more Google captcha changes. + **v1.11.13.6** *(2015-10-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.13.6/builds/4chan-X-noupdate.crx "Chromium version")] - CSS tweaks to spoiler checkbox to avoid breaking things in OneeChan. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index f59859c5d..87a052c7f 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 4461f3c96..57c39b102 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.13.6 +// @version 1.11.13.7 // @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 617b5d7ea..974bf94a4 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.13.6 +// @version 1.11.13.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.13.6', + VERSION: '1.11.13.7', NAMESPACE: '4chan X.', boards: {} }; @@ -7039,7 +7039,7 @@ }, inBubble: function() { var bubbles, ref; - bubbles = $$('.goog-bubble-content > iframe'); + bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { return el.getBoundingClientRect().bottom > 0; }); @@ -8553,7 +8553,7 @@ })(this)); }, destroy: function() { - var garbage, ins, k, len1, ref; + var garbage, i, ins, node, ref; if (!this.isEnabled) { return; } @@ -8563,13 +8563,13 @@ $.rm(this.nodes.container); } delete this.nodes.container; - ref = $$('div > .gc-bubbleDefault'); - for (k = 0, len1 = ref.length; k < len1; k++) { - garbage = ref[k]; - if ((ins = garbage.parentNode.nextSibling) && ins.nodeName === 'INS') { + 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(garbage.parentNode); + $.rm(node); } }, sync: function(captchas) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index ab66c658a..2fb8de588 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 fc9a1304b..53e3bd685 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.13.6 +// @version 1.11.13.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.13.6', + VERSION: '1.11.13.7', NAMESPACE: '4chan X.', boards: {} }; @@ -7039,7 +7039,7 @@ }, inBubble: function() { var bubbles, ref; - bubbles = $$('.goog-bubble-content > iframe'); + bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { return el.getBoundingClientRect().bottom > 0; }); @@ -8553,7 +8553,7 @@ })(this)); }, destroy: function() { - var garbage, ins, k, len1, ref; + var garbage, i, ins, node, ref; if (!this.isEnabled) { return; } @@ -8563,13 +8563,13 @@ $.rm(this.nodes.container); } delete this.nodes.container; - ref = $$('div > .gc-bubbleDefault'); - for (k = 0, len1 = ref.length; k < len1; k++) { - garbage = ref[k]; - if ((ins = garbage.parentNode.nextSibling) && ins.nodeName === 'INS') { + 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(garbage.parentNode); + $.rm(node); } }, sync: function(captchas) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index af792ac23..8c3346d82 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 f15e95313..590e9ac84 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.13.6 +// @version 1.11.13.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index cefb4fb7b..237149a68 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.13.6 +// @version 1.11.13.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -413,7 +413,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.13.6', + VERSION: '1.11.13.7', NAMESPACE: '4chan X.', boards: {} }; @@ -7039,7 +7039,7 @@ }, inBubble: function() { var bubbles, ref; - bubbles = $$('.goog-bubble-content > iframe'); + bubbles = $$('iframe[src^="https://www.google.com/recaptcha/api2/frame"]'); return (ref = d.activeElement, indexOf.call(bubbles, ref) >= 0) || bubbles.some(function(el) { return el.getBoundingClientRect().bottom > 0; }); @@ -8553,7 +8553,7 @@ })(this)); }, destroy: function() { - var garbage, ins, k, len1, ref; + var garbage, i, ins, node, ref; if (!this.isEnabled) { return; } @@ -8563,13 +8563,13 @@ $.rm(this.nodes.container); } delete this.nodes.container; - ref = $$('div > .gc-bubbleDefault'); - for (k = 0, len1 = ref.length; k < len1; k++) { - garbage = ref[k]; - if ((ins = garbage.parentNode.nextSibling) && ins.nodeName === 'INS') { + 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(garbage.parentNode); + $.rm(node); } }, sync: function(captchas) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index a7203d9da..6e46cabf0 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 f107c6aab..06c424492 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 8368a4cb4..2d56fe142 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index e56e4c9ea..aaddd6100 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.13.6", - "date": "2015-10-23T03:52:14.712Z", + "version": "1.11.13.7", + "date": "2015-10-24T01:11:25.421Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",