diff --git a/CHANGELOG.md b/CHANGELOG.md index e11af54ea..7d39ce747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## v1.14.0 +**v1.14.0.15** *(2018-05-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.15/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.15/builds/4chan-X-noupdate.crx)] +- Merge v1.13.15.12: Update workaround for ad breaking 4chan, take two. + **v1.14.0.14** *(2018-05-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.14/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.14/builds/4chan-X-noupdate.crx)] - Merge v1.13.15.11: Fix issue with HTTPS Redirect. #1876 - Merge v1.13.15.11: Update workaround for ad breaking 4chan. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 7bd3bb134..fb4aebf35 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 bba84a880..0f1cf7d59 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.14.0.14 +// @version 1.14.0.15 // @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 58b76cd9e..f735b0c82 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.0.14 +// @version 1.14.0.15 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.14', + VERSION: '1.14.0.15', NAMESPACE: '4chan X.', boards: {} }; @@ -24515,8 +24515,21 @@ Main = (function() { } }; if (location.hostname === 'boards.4chan.org') { - $.onExists(doc, '#delform > .adg-rects', $.rm); - $.onExists(doc, '#adg-ol', $.rm); + $.global(function() { + var fromCharCode0; + fromCharCode0 = String.fromCharCode; + return String.fromCharCode = function() { + if (document.body) { + String.fromCharCode = fromCharCode0; + } else if (document.currentScript && !document.currentScript.src) { + throw Error(); + } + return fromCharCode0.apply(this, arguments); + }; + }); + $.asap(docSet, function() { + return $.onExists(doc, 'iframe[srcdoc]', $.rm); + }); } flatten(null, Config); ref1 = DataBoard.keys; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index a525cf073..f152535de 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 9bc00f0d3..8d2d00687 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.14 +// @version 1.14.0.15 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.14', + VERSION: '1.14.0.15', NAMESPACE: '4chan X.', boards: {} }; @@ -24515,8 +24515,21 @@ Main = (function() { } }; if (location.hostname === 'boards.4chan.org') { - $.onExists(doc, '#delform > .adg-rects', $.rm); - $.onExists(doc, '#adg-ol', $.rm); + $.global(function() { + var fromCharCode0; + fromCharCode0 = String.fromCharCode; + return String.fromCharCode = function() { + if (document.body) { + String.fromCharCode = fromCharCode0; + } else if (document.currentScript && !document.currentScript.src) { + throw Error(); + } + return fromCharCode0.apply(this, arguments); + }; + }); + $.asap(docSet, function() { + return $.onExists(doc, 'iframe[srcdoc]', $.rm); + }); } flatten(null, Config); ref1 = DataBoard.keys; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 8e4ebfd9c..ee8f2fa6a 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 5d10c4364..4feb88346 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.14 +// @version 1.14.0.15 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 22d701b02..eab593f98 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.14 +// @version 1.14.0.15 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.14', + VERSION: '1.14.0.15', NAMESPACE: '4chan X.', boards: {} }; @@ -24515,8 +24515,21 @@ Main = (function() { } }; if (location.hostname === 'boards.4chan.org') { - $.onExists(doc, '#delform > .adg-rects', $.rm); - $.onExists(doc, '#adg-ol', $.rm); + $.global(function() { + var fromCharCode0; + fromCharCode0 = String.fromCharCode; + return String.fromCharCode = function() { + if (document.body) { + String.fromCharCode = fromCharCode0; + } else if (document.currentScript && !document.currentScript.src) { + throw Error(); + } + return fromCharCode0.apply(this, arguments); + }; + }); + $.asap(docSet, function() { + return $.onExists(doc, 'iframe[srcdoc]', $.rm); + }); } flatten(null, Config); ref1 = DataBoard.keys; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index eabfab9e6..93662f01f 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.json b/builds/updates-beta.json index 19bf9ab7b..a21908bed 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.14", + "version": "1.14.0.15", "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" } ] diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 2bd00c331..d84b159ba 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.json b/builds/updates.json index 71b9ac1e2..74d955e21 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.14", + "version": "1.14.0.15", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 91062d629..f361512d1 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 12e896de0..c2cf3e2fc 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.0.14", - "date": "2018-05-05T09:33:03.843Z" + "version": "1.14.0.15", + "date": "2018-05-05T22:44:48.373Z" } \ No newline at end of file