diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a338c30..303f4d5d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ### v1.13.15 +**v1.13.15.11** *(2018-05-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.15.11/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.15.11/builds/4chan-X-noupdate.crx)] +- Fix issue with HTTPS Redirect. #1876 +- Update workaround for ad breaking 4chan. + **v1.13.15.10** *(2018-04-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.15.10/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.15.10/builds/4chan-X-noupdate.crx)] - Fix anti-autoplay regression causing some videos not to show up. - Show 2018 Apr 01 team names in thread updates and other posts generated from JSON. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 8b9a8c049..e4e332665 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 e2ecab3f9..c796c6136 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.15.10 +// @version 1.13.15.11 // @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 1ec47035f..c0bb8ca56 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.15.10 +// @version 1.13.15.11 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.15.10', + VERSION: '1.13.15.11', NAMESPACE: '4chan X.', boards: {} }; @@ -24657,7 +24657,10 @@ Main = (function() { Conf[parent] = obj; } }; - $.onExists(doc, '#delform > .adg-rects', $.rm); + if (location.hostname === 'boards.4chan.org') { + $.onExists(doc, '#delform > .adg-rects', $.rm); + $.onExists(doc, '#adg-ol', $.rm); + } flatten(null, Config); ref1 = DataBoard.keys; for (j = 0, len = ref1.length; j < len; j++) { @@ -24698,7 +24701,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { 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); + location.replace('https://' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 50efd86c6..e4aee6443 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 edbd67a46..30f2d2973 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.15.10 +// @version 1.13.15.11 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.15.10', + VERSION: '1.13.15.11', NAMESPACE: '4chan X.', boards: {} }; @@ -24657,7 +24657,10 @@ Main = (function() { Conf[parent] = obj; } }; - $.onExists(doc, '#delform > .adg-rects', $.rm); + if (location.hostname === 'boards.4chan.org') { + $.onExists(doc, '#delform > .adg-rects', $.rm); + $.onExists(doc, '#adg-ol', $.rm); + } flatten(null, Config); ref1 = DataBoard.keys; for (j = 0, len = ref1.length; j < len; j++) { @@ -24698,7 +24701,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { 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); + location.replace('https://' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 26d0b0e21..ae857dd4a 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 a20e6cbd1..b0b9e89e1 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.15.10 +// @version 1.13.15.11 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index bb3932105..e751be79a 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.15.10 +// @version 1.13.15.11 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.15.10', + VERSION: '1.13.15.11', NAMESPACE: '4chan X.', boards: {} }; @@ -24657,7 +24657,10 @@ Main = (function() { Conf[parent] = obj; } }; - $.onExists(doc, '#delform > .adg-rects', $.rm); + if (location.hostname === 'boards.4chan.org') { + $.onExists(doc, '#delform > .adg-rects', $.rm); + $.onExists(doc, '#adg-ol', $.rm); + } flatten(null, Config); ref1 = DataBoard.keys; for (j = 0, len = ref1.length; j < len; j++) { @@ -24698,7 +24701,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { 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); + location.replace('https://' + location.host + location.pathname + location.search + location.hash); return; } return $.asap(docSet, function() { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 5390147b1..8bb9b742b 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 12a9289fa..d7b81344e 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.15.10", + "version": "1.13.15.11", "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 823ccc7d3..2d6fcb0b6 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 025bff814..934f61cb9 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.15.10", + "version": "1.13.15.11", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 61e5416e2..d4e1cba37 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 3ae7c7e3d..d68b87823 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.15.10", - "date": "2018-04-01T04:52:36.182Z" + "version": "1.13.15.11", + "date": "2018-05-05T09:19:51.924Z" } \ No newline at end of file