diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32366c69e..8f7fbf63e 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.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix bugs when `Fixed Header` is off but `Bottom Header` is on.
+
**v1.10.0.5** *(2015-02-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.5/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix thread cooldowns on /b/ and /pol/; apparently the 5-minute global cooldown after starting a thread only applies to boards other than the one you posted on.
diff --git a/LICENSE b/LICENSE
index c6f22c75c..e81e74879 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.10.0.5
+* 4chan X - Version 1.10.0.6
*
* 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 187bda124..887705b06 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 54d900dc3..e9e86119f 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.5
+// @version 1.10.0.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 b30404787..a0c22a138 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.5
+// @version 1.10.0.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.0.5
+* 4chan X - Version 1.10.0.6
*
* 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.5',
+ VERSION: '1.10.0.6',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2880,7 +2880,7 @@
var height, x;
if (down) {
x = Header.getBottomOf(root);
- if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x <= 0) {
if (!Header.isHidden()) {
@@ -2897,7 +2897,7 @@
}
} else {
x = Header.getTopOf(root);
- if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x >= 0) {
if (!Header.isHidden()) {
@@ -2930,7 +2930,7 @@
var bottom, clientHeight, headRect;
clientHeight = doc.clientHeight;
bottom = clientHeight - root.getBoundingClientRect().bottom;
- if (Conf['Bottom Header']) {
+ if (Conf['Fixed Header'] && Conf['Bottom Header']) {
headRect = Header.toggle.getBoundingClientRect();
bottom -= clientHeight - headRect.bottom + headRect.height;
}
@@ -15594,7 +15594,7 @@
return;
}
$.extend(div, {
- innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
+ innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string \`weeaboo\`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (\`only\`), replies only (\`no\`), or both (\`yes\`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the \`Show Stubs\` setting if specified: create a stub (\`yes\`) or not (\`no\`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
});
return $('.warning', div).hidden = Conf['Filter'];
},
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 9cfa7981f..7c995cf05 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 b180d61e2..ba3479093 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.5
+// @version 1.10.0.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.0.5
+* 4chan X - Version 1.10.0.6
*
* 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.5',
+ VERSION: '1.10.0.6',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2879,7 +2879,7 @@
var height, x;
if (down) {
x = Header.getBottomOf(root);
- if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x <= 0) {
if (!Header.isHidden()) {
@@ -2896,7 +2896,7 @@
}
} else {
x = Header.getTopOf(root);
- if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x >= 0) {
if (!Header.isHidden()) {
@@ -2929,7 +2929,7 @@
var bottom, clientHeight, headRect;
clientHeight = doc.clientHeight;
bottom = clientHeight - root.getBoundingClientRect().bottom;
- if (Conf['Bottom Header']) {
+ if (Conf['Fixed Header'] && Conf['Bottom Header']) {
headRect = Header.toggle.getBoundingClientRect();
bottom -= clientHeight - headRect.bottom + headRect.height;
}
@@ -15593,7 +15593,7 @@
return;
}
$.extend(div, {
- innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
+ innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string \`weeaboo\`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (\`only\`), replies only (\`no\`), or both (\`yes\`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the \`Show Stubs\` setting if specified: create a stub (\`yes\`) or not (\`no\`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
});
return $('.warning', div).hidden = Conf['Filter'];
},
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 01a141ac1..e5de795f6 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 1b37b3852..31092f78a 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.5
+// @version 1.10.0.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 6e3453a67..2ffb390b6 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.5
+// @version 1.10.0.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.10.0.5
+* 4chan X - Version 1.10.0.6
*
* 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.5',
+ VERSION: '1.10.0.6',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2880,7 +2880,7 @@
var height, x;
if (down) {
x = Header.getBottomOf(root);
- if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x <= 0) {
if (!Header.isHidden()) {
@@ -2897,7 +2897,7 @@
}
} else {
x = Header.getTopOf(root);
- if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+ if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
height = Header.bar.getBoundingClientRect().height;
if (x >= 0) {
if (!Header.isHidden()) {
@@ -2930,7 +2930,7 @@
var bottom, clientHeight, headRect;
clientHeight = doc.clientHeight;
bottom = clientHeight - root.getBoundingClientRect().bottom;
- if (Conf['Bottom Header']) {
+ if (Conf['Fixed Header'] && Conf['Bottom Header']) {
headRect = Header.toggle.getBoundingClientRect();
bottom -= clientHeight - headRect.bottom + headRect.height;
}
@@ -15594,7 +15594,7 @@
return;
}
$.extend(div, {
- innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
+ innerHTML: "Filter is disabled.
Use regular expressions, one per line.
Lines starting with a # will be ignored.
For example, /weeaboo/i will filter posts containing the string \`weeaboo\`, case-insensitive.
MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:- Per boards, separate them with commas. It is global if not specified.
For example: boards:a,jp;. - Filter OPs only along with their threads (\`only\`), replies only (\`no\`), or both (\`yes\`, this is default).
For example: op:only;, op:no; or op:yes;. - Overrule the \`Show Stubs\` setting if specified: create a stub (\`yes\`) or not (\`no\`).
For example: stub:yes; or stub:no;. - Highlight instead of hiding. You can specify a class name to use with a userstyle.
For example: highlight; or highlight:wallpaper;. - Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
Note: If you're using the native catalog rather than 4chan X's catalog, 4chan X's filters do not apply there.
The native catalog has its own separate filter list.
"
});
return $('.warning', div).hidden = Conf['Filter'];
},
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index aa981d956..e1826dbe1 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 ba74b95f3..17c042d4a 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 8d358c849..2c8462a58 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 855d118f7..84f4d5ddb 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.5",
+ "version": "1.10.0.6",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",