diff --git a/CHANGELOG.md b/CHANGELOG.md index 808b02c08..21cace69f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.24 +**v1.11.24.1** *(2016-02-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.24.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.24.1/builds/4chan-X-noupdate.crx "Chromium version")] +- Disrupt loading of ads from malicious/irresponsible providers. + **v1.11.24.0** *(2016-01-31)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.24.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.24.0/builds/4chan-X-noupdate.crx "Chromium version")] - Based on v1.11.23.2. - Bug fixes. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index e3a64b557..f3fd3ba73 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 445378e32..e38dadf50 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.24.0 +// @version 1.11.24.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,16 +10,18 @@ // @include https://boards.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @include http://www.4chan.org/* +// @include https://www.4chan.org/* // @include http://i.4cdn.org/* // @include https://i.4cdn.org/* -// @include http://www.4chan.org/banned -// @include https://www.4chan.org/banned -// @include http://www.4chan.org/feedback -// @include https://www.4chan.org/feedback // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include http://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* +// @exclude http://www.4chan.org/pass +// @exclude https://www.4chan.org/pass +// @exclude http://www.4chan.org/pass?* +// @exclude https://www.4chan.org/pass?* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 8ae0197b2..9f5ccb3c8 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.24.0 +// @version 1.11.24.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,16 +11,18 @@ // @include https://boards.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @include http://www.4chan.org/* +// @include https://www.4chan.org/* // @include http://i.4cdn.org/* // @include https://i.4cdn.org/* -// @include http://www.4chan.org/banned -// @include https://www.4chan.org/banned -// @include http://www.4chan.org/feedback -// @include https://www.4chan.org/feedback // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include http://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* +// @exclude http://www.4chan.org/pass +// @exclude https://www.4chan.org/pass +// @exclude http://www.4chan.org/pass?* +// @exclude https://www.4chan.org/pass?* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue @@ -434,7 +436,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.24.0', + VERSION: '1.11.24.1', NAMESPACE: '4chan X.', boards: {} }; @@ -949,7 +951,11 @@ }; $.global = function(fn) { - return $.globalEval("(" + fn + ")();"); + if (doc) { + return $.globalEval("(" + fn + ")();"); + } else { + return fn(); + } }; $.bytesToString = function(size) { @@ -17754,6 +17760,27 @@ }); return; } + $.global(function() { + var k, len1, nuke, prop, ref; + nuke = function(obj, prop) { + try { + return Object.defineProperty(obj, prop, { + configurable: false, + get: function() { + throw new Error(); + }, + set: function() { + throw new Error(); + } + }); + } catch (_error) {} + }; + ref = ['atOptions', 'adsterra_key', 'EpmadsConfig', 'epmads_key', 'EpomConfig', 'epom_key', 'exoDocumentProtocol']; + for (k = 0, len1 = ref.length; k < len1; k++) { + prop = ref[k]; + nuke(window, prop); + } + }); $.on(d, '4chanXInitFinished', function() { if (Main.expectInitFinished) { return delete Main.expectInitFinished; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 5e2207e15..6053b1076 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 158335384..ebdf092a6 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.24.0 +// @version 1.11.24.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,16 +11,18 @@ // @include https://boards.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @include http://www.4chan.org/* +// @include https://www.4chan.org/* // @include http://i.4cdn.org/* // @include https://i.4cdn.org/* -// @include http://www.4chan.org/banned -// @include https://www.4chan.org/banned -// @include http://www.4chan.org/feedback -// @include https://www.4chan.org/feedback // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include http://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* +// @exclude http://www.4chan.org/pass +// @exclude https://www.4chan.org/pass +// @exclude http://www.4chan.org/pass?* +// @exclude https://www.4chan.org/pass?* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue @@ -434,7 +436,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.24.0', + VERSION: '1.11.24.1', NAMESPACE: '4chan X.', boards: {} }; @@ -949,7 +951,11 @@ }; $.global = function(fn) { - return $.globalEval("(" + fn + ")();"); + if (doc) { + return $.globalEval("(" + fn + ")();"); + } else { + return fn(); + } }; $.bytesToString = function(size) { @@ -17754,6 +17760,27 @@ }); return; } + $.global(function() { + var k, len1, nuke, prop, ref; + nuke = function(obj, prop) { + try { + return Object.defineProperty(obj, prop, { + configurable: false, + get: function() { + throw new Error(); + }, + set: function() { + throw new Error(); + } + }); + } catch (_error) {} + }; + ref = ['atOptions', 'adsterra_key', 'EpmadsConfig', 'epmads_key', 'EpomConfig', 'epom_key', 'exoDocumentProtocol']; + for (k = 0, len1 = ref.length; k < len1; k++) { + prop = ref[k]; + nuke(window, prop); + } + }); $.on(d, '4chanXInitFinished', function() { if (Main.expectInitFinished) { return delete Main.expectInitFinished; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 1ad219da8..a846a623a 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 c8fa4a4d1..3986ebe47 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.24.0 +// @version 1.11.24.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,16 +10,18 @@ // @include https://boards.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @include http://www.4chan.org/* +// @include https://www.4chan.org/* // @include http://i.4cdn.org/* // @include https://i.4cdn.org/* -// @include http://www.4chan.org/banned -// @include https://www.4chan.org/banned -// @include http://www.4chan.org/feedback -// @include https://www.4chan.org/feedback // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include http://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* +// @exclude http://www.4chan.org/pass +// @exclude https://www.4chan.org/pass +// @exclude http://www.4chan.org/pass?* +// @exclude https://www.4chan.org/pass?* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 3fad7a437..517a1cebb 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.24.0 +// @version 1.11.24.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,16 +11,18 @@ // @include https://boards.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @include http://www.4chan.org/* +// @include https://www.4chan.org/* // @include http://i.4cdn.org/* // @include https://i.4cdn.org/* -// @include http://www.4chan.org/banned -// @include https://www.4chan.org/banned -// @include http://www.4chan.org/feedback -// @include https://www.4chan.org/feedback // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include http://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* +// @exclude http://www.4chan.org/pass +// @exclude https://www.4chan.org/pass +// @exclude http://www.4chan.org/pass?* +// @exclude https://www.4chan.org/pass?* // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue @@ -434,7 +436,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.24.0', + VERSION: '1.11.24.1', NAMESPACE: '4chan X.', boards: {} }; @@ -949,7 +951,11 @@ }; $.global = function(fn) { - return $.globalEval("(" + fn + ")();"); + if (doc) { + return $.globalEval("(" + fn + ")();"); + } else { + return fn(); + } }; $.bytesToString = function(size) { @@ -17754,6 +17760,27 @@ }); return; } + $.global(function() { + var k, len1, nuke, prop, ref; + nuke = function(obj, prop) { + try { + return Object.defineProperty(obj, prop, { + configurable: false, + get: function() { + throw new Error(); + }, + set: function() { + throw new Error(); + } + }); + } catch (_error) {} + }; + ref = ['atOptions', 'adsterra_key', 'EpmadsConfig', 'epmads_key', 'EpomConfig', 'epom_key', 'exoDocumentProtocol']; + for (k = 0, len1 = ref.length; k < len1; k++) { + prop = ref[k]; + nuke(window, prop); + } + }); $.on(d, '4chanXInitFinished', function() { if (Main.expectInitFinished) { return delete Main.expectInitFinished; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 21f320693..9130f7307 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 c218971be..4273570df 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 c43fa6366..d646f37e2 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 89a9313d5..9afdf4ff7 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.11.24.0", - "date": "2016-02-01T05:44:50.088Z" + "version": "1.11.24.1", + "date": "2016-02-06T02:48:47.323Z" }