diff --git a/CHANGELOG.md b/CHANGELOG.md index c3cdbf546..d20a9d6f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ### v1.13.14 +**v1.13.14.6** *(2017-11-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.6/builds/4chan-X-noupdate.crx)] +- Turn 'Force Noscript Captcha for v1' off by default in GM4 due to missing frame support. +- Fix bugs related to 4chan's ads. + **v1.13.14.5** *(2017-10-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.crx)] - Merge v1.13.13.3: Update for Halloween theme compatibility. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 537ee2950..22d557a27 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 6df25a552..016b5a9aa 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.13.14.5 +// @version 1.13.14.6 // @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 696801b18..6cc341344 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.13.14.5 +// @version 1.13.14.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.14.5', + VERSION: '1.13.14.6', NAMESPACE: '4chan X.', boards: {} }; @@ -24568,7 +24568,7 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref, w; + var db, flatten, i, items, j, k, key, len, ref, ref1, w; if (d.body && !$('title', d.head)) { return; } @@ -24601,7 +24601,7 @@ Main = (function() { return; } try { - if (window.frameElement && window.frameElement.src === '') { + if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) { return; } } catch (_error) {} @@ -24630,9 +24630,9 @@ Main = (function() { } }; flatten(null, Config); - ref = DataBoard.keys; - for (j = 0, len = ref.length; j < len; j++) { - db = ref[j]; + ref1 = DataBoard.keys; + for (j = 0, len = ref1.length; j < len; j++) { + db = ref1[j]; Conf[db] = { boards: {} }; @@ -24654,6 +24654,9 @@ Main = (function() { Conf['QR Shortcut'] = true; Conf['Bottom QR Link'] = true; Conf['Toggleable Thread Watcher'] = true; + if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) { + Conf['Force Noscript Captcha for v1'] = false; + } ($.getSync || $.get)({ 'jsWhitelist': Conf['jsWhitelist'] }, function(arg) { @@ -24667,13 +24670,13 @@ Main = (function() { } items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { - var ref1; - if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + var ref2; + if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { - var ref2, val; + var ref3, val; if ($.cantSet) { } else if (items.previousversion == null) { @@ -24686,7 +24689,7 @@ Main = (function() { } for (key in Conf) { val = Conf[key]; - Conf[key] = (ref2 = items[key]) != null ? ref2 : val; + Conf[key] = (ref3 = items[key]) != null ? ref3 : val; } return Main.initFeatures(); }); @@ -24819,7 +24822,7 @@ Main = (function() { if ($.engine) { $.addClass(doc, "ua-" + $.engine); } - $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { + $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) { return $.onExists(ad, 'img, iframe', function() { return $.addClass(doc, 'ads-loaded'); }); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 9abdb6d37..6c60c0962 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 c2763b23b..8b4e836f6 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.13.14.5 +// @version 1.13.14.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.14.5', + VERSION: '1.13.14.6', NAMESPACE: '4chan X.', boards: {} }; @@ -24568,7 +24568,7 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref, w; + var db, flatten, i, items, j, k, key, len, ref, ref1, w; if (d.body && !$('title', d.head)) { return; } @@ -24601,7 +24601,7 @@ Main = (function() { return; } try { - if (window.frameElement && window.frameElement.src === '') { + if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) { return; } } catch (_error) {} @@ -24630,9 +24630,9 @@ Main = (function() { } }; flatten(null, Config); - ref = DataBoard.keys; - for (j = 0, len = ref.length; j < len; j++) { - db = ref[j]; + ref1 = DataBoard.keys; + for (j = 0, len = ref1.length; j < len; j++) { + db = ref1[j]; Conf[db] = { boards: {} }; @@ -24654,6 +24654,9 @@ Main = (function() { Conf['QR Shortcut'] = true; Conf['Bottom QR Link'] = true; Conf['Toggleable Thread Watcher'] = true; + if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) { + Conf['Force Noscript Captcha for v1'] = false; + } ($.getSync || $.get)({ 'jsWhitelist': Conf['jsWhitelist'] }, function(arg) { @@ -24667,13 +24670,13 @@ Main = (function() { } items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { - var ref1; - if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + var ref2; + if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { - var ref2, val; + var ref3, val; if ($.cantSet) { } else if (items.previousversion == null) { @@ -24686,7 +24689,7 @@ Main = (function() { } for (key in Conf) { val = Conf[key]; - Conf[key] = (ref2 = items[key]) != null ? ref2 : val; + Conf[key] = (ref3 = items[key]) != null ? ref3 : val; } return Main.initFeatures(); }); @@ -24819,7 +24822,7 @@ Main = (function() { if ($.engine) { $.addClass(doc, "ua-" + $.engine); } - $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { + $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) { return $.onExists(ad, 'img, iframe', function() { return $.addClass(doc, 'ads-loaded'); }); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index ec7add156..2f38e6408 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 28e5a129f..d7d4f0d8f 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.14.5 +// @version 1.13.14.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index be2329262..ddee1004e 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.14.5 +// @version 1.13.14.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.14.5', + VERSION: '1.13.14.6', NAMESPACE: '4chan X.', boards: {} }; @@ -24568,7 +24568,7 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref, w; + var db, flatten, i, items, j, k, key, len, ref, ref1, w; if (d.body && !$('title', d.head)) { return; } @@ -24601,7 +24601,7 @@ Main = (function() { return; } try { - if (window.frameElement && window.frameElement.src === '') { + if (window.frameElement && ((ref = window.frameElement.src) === '' || ref === 'about:blank')) { return; } } catch (_error) {} @@ -24630,9 +24630,9 @@ Main = (function() { } }; flatten(null, Config); - ref = DataBoard.keys; - for (j = 0, len = ref.length; j < len; j++) { - db = ref[j]; + ref1 = DataBoard.keys; + for (j = 0, len = ref1.length; j < len; j++) { + db = ref1[j]; Conf[db] = { boards: {} }; @@ -24654,6 +24654,9 @@ Main = (function() { Conf['QR Shortcut'] = true; Conf['Bottom QR Link'] = true; Conf['Toggleable Thread Watcher'] = true; + if ($.engine === 'gecko' && (typeof GM !== "undefined" && GM !== null)) { + Conf['Force Noscript Captcha for v1'] = false; + } ($.getSync || $.get)({ 'jsWhitelist': Conf['jsWhitelist'] }, function(arg) { @@ -24667,13 +24670,13 @@ Main = (function() { } items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { - var ref1; - if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + var ref2; + if (!$.perProtocolSettings && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { - var ref2, val; + var ref3, val; if ($.cantSet) { } else if (items.previousversion == null) { @@ -24686,7 +24689,7 @@ Main = (function() { } for (key in Conf) { val = Conf[key]; - Conf[key] = (ref2 = items[key]) != null ? ref2 : val; + Conf[key] = (ref3 = items[key]) != null ? ref3 : val; } return Main.initFeatures(); }); @@ -24819,7 +24822,7 @@ Main = (function() { if ($.engine) { $.addClass(doc, "ua-" + $.engine); } - $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) { + $.onExists(doc, '.ad-cnt, .adg-rects > .desktop', function(ad) { return $.onExists(ad, 'img, iframe', function() { return $.addClass(doc, 'ads-loaded'); }); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 8bde394c6..4c8568f11 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 aa3622475..5b1e74873 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.14.5", + "version": "1.13.14.6", "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 98ecbe2ba..56bbf1d11 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 ede44aeae..b51231e38 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.14.5", + "version": "1.13.14.6", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 5a956f406..f4a9bd907 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 51823a241..3765104a5 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.14.5", - "date": "2017-10-30T16:54:06.453Z" + "version": "1.13.14.6", + "date": "2017-11-05T01:38:05.709Z" } \ No newline at end of file