diff --git a/CHANGELOG.md b/CHANGELOG.md index ca7726798..c38042410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### v1.13.10 +**v1.13.10.6** *(2017-08-10)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.10.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.10.6/builds/4chan-X-noupdate.crx)] +- Disable 'Redirect to HTTPS' on platforms where we use localStorage for saving settings. + **v1.13.10.5** *(2017-08-04)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.10.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.10.5/builds/4chan-X-noupdate.crx)] - Better parsing of archive links for Quote Inlining / Hover. - Add Board Tips. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 8b79bcb9a..95852c139 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 36c78d639..22a56491c 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.10.5 +// @version 1.13.10.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 d7987e319..ed681ff93 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.10.5 +// @version 1.13.10.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -153,7 +153,7 @@ docSet = function() { }; g = { - VERSION: '1.13.10.5', + VERSION: '1.13.10.6', NAMESPACE: '4chan X.', boards: {} }; @@ -4983,6 +4983,10 @@ $ = (function() { return GM_deleteValue(key); }; + if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) { + $.perProtocolSettings = true; + } + if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) { $.getValue = $.GM_getValue; $.listValues = function() { @@ -11008,6 +11012,9 @@ Settings = (function() { if ($.engine !== 'gecko') { $('div[data-name="Remember QR Size"]', section).hidden = true; } + if ($.perProtocolSettings) { + $('div[data-name="Redirect to HTTPS"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { @@ -24506,7 +24513,7 @@ Main = (function() { items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { var ref1; - if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 3fd6b5156..1a2400766 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 8c69bde13..ba2a996ea 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.10.5 +// @version 1.13.10.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -153,7 +153,7 @@ docSet = function() { }; g = { - VERSION: '1.13.10.5', + VERSION: '1.13.10.6', NAMESPACE: '4chan X.', boards: {} }; @@ -4983,6 +4983,10 @@ $ = (function() { return GM_deleteValue(key); }; + if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) { + $.perProtocolSettings = true; + } + if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) { $.getValue = $.GM_getValue; $.listValues = function() { @@ -11008,6 +11012,9 @@ Settings = (function() { if ($.engine !== 'gecko') { $('div[data-name="Remember QR Size"]', section).hidden = true; } + if ($.perProtocolSettings) { + $('div[data-name="Redirect to HTTPS"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { @@ -24506,7 +24513,7 @@ Main = (function() { items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { var ref1; - if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 402fccaf4..10e6def78 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 217d8c739..34cd8d9ea 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.10.5 +// @version 1.13.10.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 37698e9e9..dcac808bf 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.10.5 +// @version 1.13.10.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -153,7 +153,7 @@ docSet = function() { }; g = { - VERSION: '1.13.10.5', + VERSION: '1.13.10.6', NAMESPACE: '4chan X.', boards: {} }; @@ -4983,6 +4983,10 @@ $ = (function() { return GM_deleteValue(key); }; + if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) { + $.perProtocolSettings = true; + } + if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) { $.getValue = $.GM_getValue; $.listValues = function() { @@ -11008,6 +11012,9 @@ Settings = (function() { if ($.engine !== 'gecko') { $('div[data-name="Remember QR Size"]', section).hidden = true; } + if ($.perProtocolSettings) { + $('div[data-name="Redirect to HTTPS"]', section).hidden = true; + } $.get(items, function(items) { var val; for (key in items) { @@ -24506,7 +24513,7 @@ Main = (function() { items['previousversion'] = void 0; return ($.getSync || $.get)(items, function(items) { var ref1; - if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { + if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { location.replace('https:' + location.host + location.pathname + location.search + location.hash); return; } diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index e9ee6fd27..1bf20e3a6 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 adb96f810..beabaef32 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 8191369e1..21500c612 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index ad672d03d..cc569030e 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.10.5", - "date": "2017-08-04T04:26:25.809Z" + "version": "1.13.10.6", + "date": "2017-08-10T13:38:49.065Z" } \ No newline at end of file