diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddd6cb65d..7238a5fd1 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.19.8
+*2015-01-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.8/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Remove native -> 4chan X catalog redirect; restore link.
+
### v1.9.19.7
*2015-01-09* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.7/builds/4chan-X-noupdate.crx "Chromium version")]
diff --git a/LICENSE b/LICENSE
index d67613b2d..917e08551 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.19.7
+* 4chan X - Version 1.9.19.8
*
* 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 f3f085553..33ce7a5e1 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 0d6f32ff9..8d11fec10 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.19.7
+// @version 1.9.19.8
// @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 daa9a5ec3..03323a983 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.19.7
+// @version 1.9.19.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.19.7
+* 4chan X - Version 1.9.19.8
*
* 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.19.7',
+ VERSION: '1.9.19.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8917,7 +8917,7 @@
id: 'a-gallery'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
_ref = {
buttons: '.gal-buttons',
@@ -13332,7 +13332,7 @@
}
})();
$.ready(function() {
- var link, _i, _len, _ref;
+ var catalogLink, link, _i, _len, _ref;
_ref = $$(selector);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
@@ -13343,6 +13343,12 @@
case "/" + g.BOARD + "/catalog":
link.href = CatalogLinks.catalog();
}
+ if (g.VIEW === 'catalog' && Conf['JSON Navigation'] && Conf['Use 4chan X Catalog']) {
+ catalogLink = link.parentNode.cloneNode(true);
+ catalogLink.firstElementChild.textContent = '4chan X Catalog';
+ catalogLink.firstElementChild.href = CatalogLinks.catalog();
+ $.after(link.parentNode, [$.tn(' '), catalogLink]);
+ }
}
});
}
@@ -15524,7 +15530,7 @@
});
},
initFeatures: function() {
- var err, feature, name, pathname, search, _i, _len, _ref, _ref1;
+ var err, feature, name, pathname, _i, _len, _ref, _ref1;
switch (location.hostname) {
case 'a.4cdn.org':
return;
@@ -15552,11 +15558,6 @@
});
return;
}
- if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') {
- search = location.href.match(/#s=.*/);
- location.replace("//boards.4chan.org/" + g.BOARD + "/" + (search ? search[0] : '#catalog'));
- return;
- }
if (Conf['Normalize URL'] && g.VIEW === 'thread') {
pathname = location.pathname.split('/');
if (pathname[2] !== 'thread' || pathname.length > 4) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index b7d250a29..f66b41a0b 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 d9aa33316..c5ff983cf 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.19.7
+// @version 1.9.19.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.19.7
+* 4chan X - Version 1.9.19.8
*
* 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.19.7',
+ VERSION: '1.9.19.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8916,7 +8916,7 @@
id: 'a-gallery'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
_ref = {
buttons: '.gal-buttons',
@@ -13331,7 +13331,7 @@
}
})();
$.ready(function() {
- var link, _i, _len, _ref;
+ var catalogLink, link, _i, _len, _ref;
_ref = $$(selector);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
@@ -13342,6 +13342,12 @@
case "/" + g.BOARD + "/catalog":
link.href = CatalogLinks.catalog();
}
+ if (g.VIEW === 'catalog' && Conf['JSON Navigation'] && Conf['Use 4chan X Catalog']) {
+ catalogLink = link.parentNode.cloneNode(true);
+ catalogLink.firstElementChild.textContent = '4chan X Catalog';
+ catalogLink.firstElementChild.href = CatalogLinks.catalog();
+ $.after(link.parentNode, [$.tn(' '), catalogLink]);
+ }
}
});
}
@@ -15523,7 +15529,7 @@
});
},
initFeatures: function() {
- var err, feature, name, pathname, search, _i, _len, _ref, _ref1;
+ var err, feature, name, pathname, _i, _len, _ref, _ref1;
switch (location.hostname) {
case 'a.4cdn.org':
return;
@@ -15551,11 +15557,6 @@
});
return;
}
- if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') {
- search = location.href.match(/#s=.*/);
- location.replace("//boards.4chan.org/" + g.BOARD + "/" + (search ? search[0] : '#catalog'));
- return;
- }
if (Conf['Normalize URL'] && g.VIEW === 'thread') {
pathname = location.pathname.split('/');
if (pathname[2] !== 'thread' || pathname.length > 4) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index de41c23e1..65e958364 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 34e1ed800..a5f777669 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.19.7
+// @version 1.9.19.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 2111e74af..4a37524d2 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.19.7
+// @version 1.9.19.8
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.19.7
+* 4chan X - Version 1.9.19.8
*
* 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.19.7',
+ VERSION: '1.9.19.8',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8917,7 +8917,7 @@
id: 'a-gallery'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
_ref = {
buttons: '.gal-buttons',
@@ -13332,7 +13332,7 @@
}
})();
$.ready(function() {
- var link, _i, _len, _ref;
+ var catalogLink, link, _i, _len, _ref;
_ref = $$(selector);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
link = _ref[_i];
@@ -13343,6 +13343,12 @@
case "/" + g.BOARD + "/catalog":
link.href = CatalogLinks.catalog();
}
+ if (g.VIEW === 'catalog' && Conf['JSON Navigation'] && Conf['Use 4chan X Catalog']) {
+ catalogLink = link.parentNode.cloneNode(true);
+ catalogLink.firstElementChild.textContent = '4chan X Catalog';
+ catalogLink.firstElementChild.href = CatalogLinks.catalog();
+ $.after(link.parentNode, [$.tn(' '), catalogLink]);
+ }
}
});
}
@@ -15524,7 +15530,7 @@
});
},
initFeatures: function() {
- var err, feature, name, pathname, search, _i, _len, _ref, _ref1;
+ var err, feature, name, pathname, _i, _len, _ref, _ref1;
switch (location.hostname) {
case 'a.4cdn.org':
return;
@@ -15552,11 +15558,6 @@
});
return;
}
- if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') {
- search = location.href.match(/#s=.*/);
- location.replace("//boards.4chan.org/" + g.BOARD + "/" + (search ? search[0] : '#catalog'));
- return;
- }
if (Conf['Normalize URL'] && g.VIEW === 'thread') {
pathname = location.pathname.split('/');
if (pathname[2] !== 'thread' || pathname.length > 4) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index ada84ce53..b8e729842 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 ecc0baac9..d3aa4a702 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 536c36d22..dc84443c8 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 012821b58..7152d7cb6 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.19.7",
+ "version": "1.9.19.8",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",