diff --git a/CHANGELOG.md b/CHANGELOG.md index b44c0ef1a..97193c9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ### v1.13.13 +**v1.13.13.1** *(2017-10-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.13.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.13.1/builds/4chan-X-noupdate.crx)] +- Fix setting clearing/importing in GM4. #1531 +- Fix issue with new Tampermonkey version on Edge. #1534 + **v1.13.13.0** *(2017-10-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.13.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.13.0/builds/4chan-X-noupdate.crx)] - Based on v1.13.12.3. - Experimental support for installing the Chrome extension version in Firefox. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 7817b1d7f..0147c8599 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 c4f029ab6..f53693147 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.13.0 +// @version 1.13.13.1 // @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 ce4a667d8..cb08a077a 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.13.0 +// @version 1.13.13.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.13.0', + VERSION: '1.13.13.1', NAMESPACE: '4chan X.', boards: {} }; @@ -4979,7 +4979,7 @@ $ = (function() { $.syncing = {}; - if ((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) { + if (((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) && window.BroadcastChannel && (typeof GM_addValueChangeListener === "undefined" || GM_addValueChangeListener === null)) { $.syncChannel = new BroadcastChannel(g.NAMESPACE + 'sync'); $.on($.syncChannel, 'message', function(e) { var cb, key, ref, results, val; @@ -5059,7 +5059,7 @@ $ = (function() { }); }); $.clear = function(cb) { - return GM.listValues.then(function(keys) { + return GM.listValues().then(function(keys) { return $["delete"](keys.map(function(key) { return key.replace(g.NAMESPACE, ''); }), cb); @@ -24569,14 +24569,20 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref; + var db, flatten, i, items, j, k, key, len, ref, w; if (d.body && !$('title', d.head)) { return; } - if (window['4chan X antidup']) { - return; - } - window['4chan X antidup'] = true; + try { + w = window; + if ($.platform === 'crx') { + w = w.wrappedJSObject || w; + } + if ('4chan X antidup' in w) { + return; + } + w['4chan X antidup'] = true; + } catch (_error) {} if (location.hostname === 'www.google.com') { if (location.pathname === '/recaptcha/api/noscript') { $.ready(function() { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index c7c6b8c20..ca80b42ff 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 320115e42..d83ead8fa 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.13.0 +// @version 1.13.13.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.13.0', + VERSION: '1.13.13.1', NAMESPACE: '4chan X.', boards: {} }; @@ -4979,7 +4979,7 @@ $ = (function() { $.syncing = {}; - if ((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) { + if (((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) && window.BroadcastChannel && (typeof GM_addValueChangeListener === "undefined" || GM_addValueChangeListener === null)) { $.syncChannel = new BroadcastChannel(g.NAMESPACE + 'sync'); $.on($.syncChannel, 'message', function(e) { var cb, key, ref, results, val; @@ -5059,7 +5059,7 @@ $ = (function() { }); }); $.clear = function(cb) { - return GM.listValues.then(function(keys) { + return GM.listValues().then(function(keys) { return $["delete"](keys.map(function(key) { return key.replace(g.NAMESPACE, ''); }), cb); @@ -24569,14 +24569,20 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref; + var db, flatten, i, items, j, k, key, len, ref, w; if (d.body && !$('title', d.head)) { return; } - if (window['4chan X antidup']) { - return; - } - window['4chan X antidup'] = true; + try { + w = window; + if ($.platform === 'crx') { + w = w.wrappedJSObject || w; + } + if ('4chan X antidup' in w) { + return; + } + w['4chan X antidup'] = true; + } catch (_error) {} if (location.hostname === 'www.google.com') { if (location.pathname === '/recaptcha/api/noscript') { $.ready(function() { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 0884be26b..399fd4a63 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 9cdd3fcc6..bf827b6f9 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.13.0 +// @version 1.13.13.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index ccd5e6cc6..4aa2e60d2 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.13.0 +// @version 1.13.13.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -159,7 +159,7 @@ docSet = function() { }; g = { - VERSION: '1.13.13.0', + VERSION: '1.13.13.1', NAMESPACE: '4chan X.', boards: {} }; @@ -4979,7 +4979,7 @@ $ = (function() { $.syncing = {}; - if ((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) { + if (((typeof GM !== "undefined" && GM !== null ? GM.deleteValue : void 0) != null) && window.BroadcastChannel && (typeof GM_addValueChangeListener === "undefined" || GM_addValueChangeListener === null)) { $.syncChannel = new BroadcastChannel(g.NAMESPACE + 'sync'); $.on($.syncChannel, 'message', function(e) { var cb, key, ref, results, val; @@ -5059,7 +5059,7 @@ $ = (function() { }); }); $.clear = function(cb) { - return GM.listValues.then(function(keys) { + return GM.listValues().then(function(keys) { return $["delete"](keys.map(function(key) { return key.replace(g.NAMESPACE, ''); }), cb); @@ -24569,14 +24569,20 @@ Main = (function() { Main = { init: function() { - var db, flatten, i, items, j, k, key, len, ref; + var db, flatten, i, items, j, k, key, len, ref, w; if (d.body && !$('title', d.head)) { return; } - if (window['4chan X antidup']) { - return; - } - window['4chan X antidup'] = true; + try { + w = window; + if ($.platform === 'crx') { + w = w.wrappedJSObject || w; + } + if ('4chan X antidup' in w) { + return; + } + w['4chan X antidup'] = true; + } catch (_error) {} if (location.hostname === 'www.google.com') { if (location.pathname === '/recaptcha/api/noscript') { $.ready(function() { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index c2bb36497..01fbe8f0f 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 708485cd5..1b30746e5 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.13.0", + "version": "1.13.13.1", "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 55bc7528a..a804975f4 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 18a006f32..2c13b5f6d 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.13.13.0", + "version": "1.13.13.1", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 6c990bc3c..45fc66a99 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index a118fe79c..9c2f7a2bd 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.13.0", - "date": "2017-10-09T00:36:31.712Z" + "version": "1.13.13.1", + "date": "2017-10-18T03:50:27.794Z" } \ No newline at end of file