diff --git a/CHANGELOG.md b/CHANGELOG.md
index 671bdf9a0..b6ca997e4 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
+### v1.9.18.2
+*2014-12-29* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.2/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Merge v1.9.17.11: Fix index refresh time bug introduced in v1.9.17.0.
+
### v1.9.18.1
*2014-12-28* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.1/builds/4chan-X-noupdate.crx "Chromium version")]
diff --git a/LICENSE b/LICENSE
index 76f27ae59..8221af61c 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.18.1
+* 4chan X - Version 1.9.18.2
*
* 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 f45cd8724..0d16f4dbf 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 c4db7c8cf..d4c2f77e9 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.9.18.1
+// @version 1.9.18.2
// @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 398caac95..1a1a855d0 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.9.18.1
+// @version 1.9.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.1
+* 4chan X - Version 1.9.18.2
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.1',
+ VERSION: '1.9.18.2',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14441,29 +14441,16 @@
RelativeDates = {
INTERVAL: $.MINUTE / 2,
init: function() {
- if (!Conf['Relative Post Dates']) {
- return;
+ if (g.VIEW !== 'catalog' && Conf['Relative Post Dates'] && !Conf['Relative Date Title'] || g.VIEW === 'index' && Conf['JSON Navigation'] && g.BOARD.ID !== 'f') {
+ this.flush();
+ $.on(d, 'visibilitychange ThreadUpdate', this.flush);
}
- if (!Conf['Relative Date Title']) {
- switch (g.VIEW) {
- case 'index':
- this.flush();
- $.on(d, 'visibilitychange', this.flush);
- break;
- case 'thread':
- this.flush();
- if (g.VIEW === 'thread') {
- $.on(d, 'visibilitychange ThreadUpdate', this.flush);
- }
- break;
- default:
- return;
- }
+ if (Conf['Relative Post Dates']) {
+ return Post.callbacks.push({
+ name: 'Relative Post Dates',
+ cb: this.node
+ });
}
- return Post.callbacks.push({
- name: 'Relative Post Dates',
- cb: this.node
- });
},
node: function() {
var dateEl;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 79b636295..877172bdd 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 c9637a4f8..e43b3b0bb 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.9.18.1
+// @version 1.9.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.1
+* 4chan X - Version 1.9.18.2
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -394,7 +394,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.1',
+ VERSION: '1.9.18.2',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14440,29 +14440,16 @@
RelativeDates = {
INTERVAL: $.MINUTE / 2,
init: function() {
- if (!Conf['Relative Post Dates']) {
- return;
+ if (g.VIEW !== 'catalog' && Conf['Relative Post Dates'] && !Conf['Relative Date Title'] || g.VIEW === 'index' && Conf['JSON Navigation'] && g.BOARD.ID !== 'f') {
+ this.flush();
+ $.on(d, 'visibilitychange ThreadUpdate', this.flush);
}
- if (!Conf['Relative Date Title']) {
- switch (g.VIEW) {
- case 'index':
- this.flush();
- $.on(d, 'visibilitychange', this.flush);
- break;
- case 'thread':
- this.flush();
- if (g.VIEW === 'thread') {
- $.on(d, 'visibilitychange ThreadUpdate', this.flush);
- }
- break;
- default:
- return;
- }
+ if (Conf['Relative Post Dates']) {
+ return Post.callbacks.push({
+ name: 'Relative Post Dates',
+ cb: this.node
+ });
}
- return Post.callbacks.push({
- name: 'Relative Post Dates',
- cb: this.node
- });
},
node: function() {
var dateEl;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 6aa3e34b0..e0d598a29 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 825bf2838..c8cec0c9a 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.18.1
+// @version 1.9.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index eeefd674b..0986e9bd1 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.9.18.1
+// @version 1.9.18.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.1
+* 4chan X - Version 1.9.18.2
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.1',
+ VERSION: '1.9.18.2',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14441,29 +14441,16 @@
RelativeDates = {
INTERVAL: $.MINUTE / 2,
init: function() {
- if (!Conf['Relative Post Dates']) {
- return;
+ if (g.VIEW !== 'catalog' && Conf['Relative Post Dates'] && !Conf['Relative Date Title'] || g.VIEW === 'index' && Conf['JSON Navigation'] && g.BOARD.ID !== 'f') {
+ this.flush();
+ $.on(d, 'visibilitychange ThreadUpdate', this.flush);
}
- if (!Conf['Relative Date Title']) {
- switch (g.VIEW) {
- case 'index':
- this.flush();
- $.on(d, 'visibilitychange', this.flush);
- break;
- case 'thread':
- this.flush();
- if (g.VIEW === 'thread') {
- $.on(d, 'visibilitychange ThreadUpdate', this.flush);
- }
- break;
- default:
- return;
- }
+ if (Conf['Relative Post Dates']) {
+ return Post.callbacks.push({
+ name: 'Relative Post Dates',
+ cb: this.node
+ });
}
- return Post.callbacks.push({
- name: 'Relative Post Dates',
- cb: this.node
- });
},
node: function() {
var dateEl;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 13183ed8b..0c8fc33e4 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 5b5294984..02c40b3f4 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 42783dc8d..941519d22 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 6a747abb3..819b9ad8e 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.9.18.1",
+ "version": "1.9.18.2",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",