diff --git a/CHANGELOG.md b/CHANGELOG.md index 466aaae8f..e1b940f0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ## v1.14.0 +**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. +- (saxamaphone69) Support Vocaroo HTTPS embedding. + **v1.14.0.13** *(2018-05-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.13/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.13/builds/4chan-X-noupdate.crx)] - Fix some bugs in data storage. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 4e885f898..7bd3bb134 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 89dbf88cf..bba84a880 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.13 +// @version 1.14.0.14 // @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 5d96d901d..58b76cd9e 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.13 +// @version 1.14.0.14 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.13', + VERSION: '1.14.0.14', NAMESPACE: '4chan X.', boards: {} }; @@ -11790,7 +11790,7 @@ Settings = (function() { } }, upgrade: function(data, version) { - var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, message, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; + var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; changes = {}; set = function(key, value) { return data[key] = changes[key] = value; @@ -12023,12 +12023,6 @@ Settings = (function() { } } } - if (compareString < '00001.00013.00014.00012') { - message = $.el('div', { - innerHTML: "Feedback request:
What features from 4chan X do you wish were available on other sites you use?" - }); - new Notice('info', message); - } if (compareString < '00001.00014.00000.00006') { if (data['siteSoftware'] != null) { set('siteSoftware', data['siteSoftware'] + '\n4cdn.org yotsuba'); @@ -15587,7 +15581,7 @@ Embedding = (function() { preload: 'auto' }); type = el.canPlayType('audio/webm') ? 'webm' : 'mp3'; - el.src = "http://vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; + el.src = "//vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; return el; } }, { @@ -24520,7 +24514,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++) { @@ -24561,7 +24558,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { var ref2; if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((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 d8f48da31..a525cf073 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 d66eadf4c..9bc00f0d3 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.13 +// @version 1.14.0.14 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.13', + VERSION: '1.14.0.14', NAMESPACE: '4chan X.', boards: {} }; @@ -11790,7 +11790,7 @@ Settings = (function() { } }, upgrade: function(data, version) { - var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, message, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; + var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; changes = {}; set = function(key, value) { return data[key] = changes[key] = value; @@ -12023,12 +12023,6 @@ Settings = (function() { } } } - if (compareString < '00001.00013.00014.00012') { - message = $.el('div', { - innerHTML: "Feedback request:
What features from 4chan X do you wish were available on other sites you use?" - }); - new Notice('info', message); - } if (compareString < '00001.00014.00000.00006') { if (data['siteSoftware'] != null) { set('siteSoftware', data['siteSoftware'] + '\n4cdn.org yotsuba'); @@ -15587,7 +15581,7 @@ Embedding = (function() { preload: 'auto' }); type = el.canPlayType('audio/webm') ? 'webm' : 'mp3'; - el.src = "http://vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; + el.src = "//vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; return el; } }, { @@ -24520,7 +24514,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++) { @@ -24561,7 +24558,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { var ref2; if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((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 1dbf2881b..8e4ebfd9c 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 fb8831905..5d10c4364 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.13 +// @version 1.14.0.14 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index d8be82485..22d701b02 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.13 +// @version 1.14.0.14 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.13', + VERSION: '1.14.0.14', NAMESPACE: '4chan X.', boards: {} }; @@ -11790,7 +11790,7 @@ Settings = (function() { } }, upgrade: function(data, version) { - var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, message, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; + var addCSS, addSauces, boardID, changes, compareString, corrupted, j, k, key, len, len1, list, name, record, ref, ref1, ref2, ref3, ref4, ref5, ref6, rice, set, setD, type, uids, val, val2, value; changes = {}; set = function(key, value) { return data[key] = changes[key] = value; @@ -12023,12 +12023,6 @@ Settings = (function() { } } } - if (compareString < '00001.00013.00014.00012') { - message = $.el('div', { - innerHTML: "Feedback request:
What features from 4chan X do you wish were available on other sites you use?" - }); - new Notice('info', message); - } if (compareString < '00001.00014.00000.00006') { if (data['siteSoftware'] != null) { set('siteSoftware', data['siteSoftware'] + '\n4cdn.org yotsuba'); @@ -15587,7 +15581,7 @@ Embedding = (function() { preload: 'auto' }); type = el.canPlayType('audio/webm') ? 'webm' : 'mp3'; - el.src = "http://vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; + el.src = "//vocaroo.com/media_command.php?media=" + a.dataset.uid + "&command=download_" + type; return el; } }, { @@ -24520,7 +24514,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++) { @@ -24561,7 +24558,7 @@ Main = (function() { return ($.getSync || $.get)(items, function(items) { var ref2; if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((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 05f37dba1..eabfab9e6 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 a1b494693..19bf9ab7b 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.13", + "version": "1.14.0.14", "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 3cc40c309..2bd00c331 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 3381910cb..71b9ac1e2 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.13", + "version": "1.14.0.14", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 8e36433a5..91062d629 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 23d80a669..12e896de0 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.0.13", - "date": "2018-05-01T22:20:21.861Z" + "version": "1.14.0.14", + "date": "2018-05-05T09:33:03.843Z" } \ No newline at end of file