diff --git a/CHANGELOG.md b/CHANGELOG.md index d6cc57028..2be78f29f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ## v1.10.0 +**v1.10.0.4** *(2015-02-12)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.4/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.9.23.11: Fix importing/resetting settings in Firefox 35+. + **v1.10.0.3** *(2015-02-11)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.3/builds/4chan-X-noupdate.crx "Chromium version")] - Merge v1.9.23.10: 4chan has moved thumbnails to i.4cdn.org. diff --git a/LICENSE b/LICENSE index 1dd292808..f4d885e05 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.10.0.3 +* 4chan X - Version 1.10.0.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 0c84e0d51..46e6ee958 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 4b75c6cf5..785d1b0ab 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.10.0.3 +// @version 1.10.0.4 // @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 e1b5620f0..915a44f34 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.10.0.3 +// @version 1.10.0.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.3 +* 4chan X - Version 1.10.0.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.3', + VERSION: '1.10.0.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -955,9 +955,46 @@ })(); $.clear = function(cb) { - $["delete"](GM_listValues().map(function(key) { - return key.replace(g.NAMESPACE, ''); - })); + var a, board, boards, err, id; + try { + $["delete"](GM_listValues().map(function(key) { + return key.replace(g.NAMESPACE, ''); + })); + } catch (_error) { + err = _error; + $["delete"](Object.keys(Conf)); + $["delete"](['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']); + $["delete"]((function() { + var _i, _len, _ref, _results; + _ref = ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr']; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + id = _ref[_i]; + _results.push("" + id + ".position"); + } + return _results; + })()); + boards = (function() { + var _i, _len, _ref, _results; + _ref = $$('#boardNavDesktop > .boardList > a'); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + a = _ref[_i]; + _results.push(a.textContent); + } + return _results; + })(); + boards.push('qa'); + $["delete"]((function() { + var _i, _len, _results; + _results = []; + for (_i = 0, _len = boards.length; _i < _len; _i++) { + board = boards[_i]; + _results.push("cooldown." + board); + } + return _results; + })()); + } return typeof cb === "function" ? cb() : void 0; }; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 96113fa09..7c02a5d71 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 cfb5c66e6..271cf174a 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.10.0.3 +// @version 1.10.0.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.3 +* 4chan X - Version 1.10.0.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -404,7 +404,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.3', + VERSION: '1.10.0.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -954,9 +954,46 @@ })(); $.clear = function(cb) { - $["delete"](GM_listValues().map(function(key) { - return key.replace(g.NAMESPACE, ''); - })); + var a, board, boards, err, id; + try { + $["delete"](GM_listValues().map(function(key) { + return key.replace(g.NAMESPACE, ''); + })); + } catch (_error) { + err = _error; + $["delete"](Object.keys(Conf)); + $["delete"](['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']); + $["delete"]((function() { + var _i, _len, _ref, _results; + _ref = ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr']; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + id = _ref[_i]; + _results.push("" + id + ".position"); + } + return _results; + })()); + boards = (function() { + var _i, _len, _ref, _results; + _ref = $$('#boardNavDesktop > .boardList > a'); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + a = _ref[_i]; + _results.push(a.textContent); + } + return _results; + })(); + boards.push('qa'); + $["delete"]((function() { + var _i, _len, _results; + _results = []; + for (_i = 0, _len = boards.length; _i < _len; _i++) { + board = boards[_i]; + _results.push("cooldown." + board); + } + return _results; + })()); + } return typeof cb === "function" ? cb() : void 0; }; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 1cf1b0397..726fe1792 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 aae7c4daf..4a96ee20c 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.0.3 +// @version 1.10.0.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 3bb08a821..24de27352 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.10.0.3 +// @version 1.10.0.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.3 +* 4chan X - Version 1.10.0.4 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.3', + VERSION: '1.10.0.4', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -955,9 +955,46 @@ })(); $.clear = function(cb) { - $["delete"](GM_listValues().map(function(key) { - return key.replace(g.NAMESPACE, ''); - })); + var a, board, boards, err, id; + try { + $["delete"](GM_listValues().map(function(key) { + return key.replace(g.NAMESPACE, ''); + })); + } catch (_error) { + err = _error; + $["delete"](Object.keys(Conf)); + $["delete"](['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']); + $["delete"]((function() { + var _i, _len, _ref, _results; + _ref = ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr']; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + id = _ref[_i]; + _results.push("" + id + ".position"); + } + return _results; + })()); + boards = (function() { + var _i, _len, _ref, _results; + _ref = $$('#boardNavDesktop > .boardList > a'); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + a = _ref[_i]; + _results.push(a.textContent); + } + return _results; + })(); + boards.push('qa'); + $["delete"]((function() { + var _i, _len, _results; + _results = []; + for (_i = 0, _len = boards.length; _i < _len; _i++) { + board = boards[_i]; + _results.push("cooldown." + board); + } + return _results; + })()); + } return typeof cb === "function" ? cb() : void 0; }; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 9929f711f..00fa4ec6e 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 d9a74cc79..b2c5e19dd 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 bf3671bd1..cc6e2072d 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 6c3a3741c..8621a1605 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.0.3", + "version": "1.10.0.4", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",