diff --git a/CHANGELOG.md b/CHANGELOG.md
index 338128a11..c3cdbf546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
### v1.13.14
+**v1.13.14.5** *(2017-10-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.5/builds/4chan-X-noupdate.crx)]
+- Merge v1.13.13.3: Update for Halloween theme compatibility.
+
**v1.13.14.4** *(2017-10-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.14.4/builds/4chan-X-noupdate.crx)]
- Merge v1.13.13.2: Drop now redundant /qa/ message.
- Read /pol/ flags from 4chan API instead of hardcoding them.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index abb63da49..537ee2950 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 d66473e16..6df25a552 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.13.14.4
+// @version 1.13.14.5
// @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 6aa6c732e..696801b18 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.13.14.4
+// @version 1.13.14.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -159,7 +159,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.14.4',
+ VERSION: '1.13.14.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24853,14 +24853,7 @@ Main = (function() {
return Main.setClass();
},
setClass: function() {
- var mainStyleSheet, setStyle, spooky, style, styleSheets;
- if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) {
- spooky.removeAttribute('media');
- if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') {
- $.addClass(doc, 'spooky');
- return;
- }
- }
+ var mainStyleSheet, setStyle, style, styleSheets;
if (g.VIEW === 'catalog') {
$.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-'));
return;
@@ -24876,6 +24869,12 @@ Main = (function() {
styleSheet = styleSheets[j];
if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) {
style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-');
+ if (style === '_special') {
+ style = styleSheet.href.match(/[a-z]*(?=[^\/]*$)/)[0];
+ }
+ if (style !== 'yotsuba' && style !== 'yotsuba-b' && style !== 'futaba' && style !== 'burichan' && style !== 'photon' && style !== 'tomorrow' && style !== 'spooky') {
+ style = null;
+ }
break;
}
}
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 94755b1f6..9abdb6d37 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 639eb3116..c2763b23b 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.14.4
+// @version 1.13.14.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -159,7 +159,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.14.4',
+ VERSION: '1.13.14.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24853,14 +24853,7 @@ Main = (function() {
return Main.setClass();
},
setClass: function() {
- var mainStyleSheet, setStyle, spooky, style, styleSheets;
- if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) {
- spooky.removeAttribute('media');
- if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') {
- $.addClass(doc, 'spooky');
- return;
- }
- }
+ var mainStyleSheet, setStyle, style, styleSheets;
if (g.VIEW === 'catalog') {
$.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-'));
return;
@@ -24876,6 +24869,12 @@ Main = (function() {
styleSheet = styleSheets[j];
if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) {
style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-');
+ if (style === '_special') {
+ style = styleSheet.href.match(/[a-z]*(?=[^\/]*$)/)[0];
+ }
+ if (style !== 'yotsuba' && style !== 'yotsuba-b' && style !== 'futaba' && style !== 'burichan' && style !== 'photon' && style !== 'tomorrow' && style !== 'spooky') {
+ style = null;
+ }
break;
}
}
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index ef300227a..ec7add156 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 cf364128a..28e5a129f 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.14.4
+// @version 1.13.14.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 97708dd9e..be2329262 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.14.4
+// @version 1.13.14.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -159,7 +159,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.14.4',
+ VERSION: '1.13.14.5',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -24853,14 +24853,7 @@ Main = (function() {
return Main.setClass();
},
setClass: function() {
- var mainStyleSheet, setStyle, spooky, style, styleSheets;
- if ((spooky = $('link[rel="stylesheet"][href^="//s.4cdn.org/css/spooky."]', d.head))) {
- spooky.removeAttribute('media');
- if (getComputedStyle(d.body).color === 'rgb(196, 151, 86)') {
- $.addClass(doc, 'spooky');
- return;
- }
- }
+ var mainStyleSheet, setStyle, style, styleSheets;
if (g.VIEW === 'catalog') {
$.addClass(doc, $.id('base-css').href.match(/catalog_(\w+)/)[1].replace('_new', '').replace(/_+/g, '-'));
return;
@@ -24876,6 +24869,12 @@ Main = (function() {
styleSheet = styleSheets[j];
if (styleSheet.href === (mainStyleSheet != null ? mainStyleSheet.href : void 0)) {
style = styleSheet.title.toLowerCase().replace('new', '').trim().replace(/\s+/g, '-');
+ if (style === '_special') {
+ style = styleSheet.href.match(/[a-z]*(?=[^\/]*$)/)[0];
+ }
+ if (style !== 'yotsuba' && style !== 'yotsuba-b' && style !== 'futaba' && style !== 'burichan' && style !== 'photon' && style !== 'tomorrow' && style !== 'spooky') {
+ style = null;
+ }
break;
}
}
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 70907adae..8bde394c6 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index 52fb41757..aa3622475 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.13.14.4",
+ "version": "1.13.14.5",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 1aaddf00f..98ecbe2ba 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.json b/builds/updates.json
index a176ff079..ede44aeae 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.13.14.4",
+ "version": "1.13.14.5",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index 3f820edc6..5a956f406 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 13858a20e..51823a241 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.13.14.4",
- "date": "2017-10-27T16:19:03.316Z"
+ "version": "1.13.14.5",
+ "date": "2017-10-30T16:54:06.453Z"
}
\ No newline at end of file