diff --git a/CHANGELOG.md b/CHANGELOG.md
index a29c3defa..a7e24e5dd 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.1
+**v1.10.1.11** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.11/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.0.7: Work around more issues with clearing settings in Firefox 35+.
+
**v1.10.1.10** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.10/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix watch thread icon in Chromium 41+.
diff --git a/LICENSE b/LICENSE
index 62e61f63a..1c84b1f0e 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.10.1.10
+* 4chan X - Version 1.10.1.11
*
* 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 2dd615ae0..0de8f2b96 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 42d66b82c..52a4b04a0 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.1.10
+// @version 1.10.1.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 bf1833167..623c0a903 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.1.10
+// @version 1.10.1.11
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.10
+* 4chan X - Version 1.10.1.11
*
* 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.1.10',
+ VERSION: '1.10.1.11',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -957,46 +957,44 @@
})();
$.clear = function(cb) {
- var a, board, boards, err, id;
+ var a, board, boards, id;
+ $["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;
+ })());
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;
- })());
- }
+ } catch (_error) {}
return typeof cb === "function" ? cb() : void 0;
};
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index ec8be88ab..cbddd42bd 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 f6aa9cdee..fe4a8c2ea 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.1.10
+// @version 1.10.1.11
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.10
+* 4chan X - Version 1.10.1.11
*
* 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.1.10',
+ VERSION: '1.10.1.11',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -956,46 +956,44 @@
})();
$.clear = function(cb) {
- var a, board, boards, err, id;
+ var a, board, boards, id;
+ $["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;
+ })());
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;
- })());
- }
+ } catch (_error) {}
return typeof cb === "function" ? cb() : void 0;
};
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 658ea3177..05015d167 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 bc91c64e0..1303e9564 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.1.10
+// @version 1.10.1.11
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 964e18e32..97c9ba20f 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.1.10
+// @version 1.10.1.11
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.1.10
+* 4chan X - Version 1.10.1.11
*
* 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.1.10',
+ VERSION: '1.10.1.11',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -957,46 +957,44 @@
})();
$.clear = function(cb) {
- var a, board, boards, err, id;
+ var a, board, boards, id;
+ $["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;
+ })());
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;
- })());
- }
+ } catch (_error) {}
return typeof cb === "function" ? cb() : void 0;
};
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index d6b1b8992..f80304ca9 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 c4f72ce24..4d76429de 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 48e09a745..dd24039d3 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 5a5ca3dba..10460aac2 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.1.10",
+ "version": "1.10.1.11",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",