diff --git a/CHANGELOG.md b/CHANGELOG.md
index aac645b92..4e4d29bef 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.11
+**v1.11.11.2** *(2015-09-30)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.10.7: Show party hats in 4chan X catalog view.
+
**v1.11.11.1** *(2015-09-28)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Resurrected quotelinks now open in the same tab, consistent with normal quotelink behavior.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index c8154b548..8a0b1e9d2 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 106f16dcd..bd5574bfe 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.11.11.1
+// @version 1.11.11.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 cb74a7426..df8c4eeec 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.11.11.1
+// @version 1.11.11.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -413,7 +413,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.11.1',
+ VERSION: '1.11.11.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3269,12 +3269,16 @@
return;
}
Index.hat = $('.board > .thread > img:first-child');
- if (Index.hat && Index.nodes) {
- ref6 = Index.nodes;
- for (u = 0, len3 = ref6.length; u < len3; u++) {
- threadRoot = ref6[u];
- $.prepend(threadRoot, Index.hat.cloneNode(false));
+ if (Index.hat) {
+ if (Index.nodes) {
+ ref6 = Index.nodes;
+ for (u = 0, len3 = ref6.length; u < len3; u++) {
+ threadRoot = ref6[u];
+ $.prepend(threadRoot, Index.hat.cloneNode(false));
+ }
}
+ $.addClass(doc, 'hats-enabled');
+ $.addStyle(".catalog-thread::after {background-image: url(" + Index.hat.src + ");}");
}
board = $('.board');
$.replace(board, Index.root);
@@ -18932,6 +18936,7 @@
" margin: 0 2px 5px;\n" +
" word-wrap: break-word;\n" +
" vertical-align: top;\n" +
+" position: relative;\n" +
"}\n" +
".catalog-thread > a {\n" +
" flex-shrink: 0;\n" +
@@ -19013,6 +19018,24 @@
" display: inline-block;\n" +
" max-width: 100%;\n" +
"}\n" +
+":root.hats-enabled .catalog-thread::after {\n" +
+" content: '';\n" +
+" pointer-events: none;\n" +
+" position: absolute;\n" +
+" background-size: contain;\n" +
+"}\n" +
+":root.hats-enabled .catalog-small .catalog-thread::after {\n" +
+" left: -10px;\n" +
+" top: -65px;\n" +
+" width: 100px;\n" +
+" height: 100px;\n" +
+"}\n" +
+":root.hats-enabled .catalog-large .catalog-thread::after {\n" +
+" left: -15px;\n" +
+" top: -105px;\n" +
+" width: 160px;\n" +
+" height: 160px;\n" +
+"}\n" +
"/* Announcement Hiding */\n" +
":root.hide-announcement #globalMessage {\n" +
" display: none;\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 075671e26..f4e9fcf0c 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 f9054d9d2..ba1791767 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.11.11.1
+// @version 1.11.11.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -413,7 +413,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.11.1',
+ VERSION: '1.11.11.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3269,12 +3269,16 @@
return;
}
Index.hat = $('.board > .thread > img:first-child');
- if (Index.hat && Index.nodes) {
- ref6 = Index.nodes;
- for (u = 0, len3 = ref6.length; u < len3; u++) {
- threadRoot = ref6[u];
- $.prepend(threadRoot, Index.hat.cloneNode(false));
+ if (Index.hat) {
+ if (Index.nodes) {
+ ref6 = Index.nodes;
+ for (u = 0, len3 = ref6.length; u < len3; u++) {
+ threadRoot = ref6[u];
+ $.prepend(threadRoot, Index.hat.cloneNode(false));
+ }
}
+ $.addClass(doc, 'hats-enabled');
+ $.addStyle(".catalog-thread::after {background-image: url(" + Index.hat.src + ");}");
}
board = $('.board');
$.replace(board, Index.root);
@@ -18932,6 +18936,7 @@
" margin: 0 2px 5px;\n" +
" word-wrap: break-word;\n" +
" vertical-align: top;\n" +
+" position: relative;\n" +
"}\n" +
".catalog-thread > a {\n" +
" flex-shrink: 0;\n" +
@@ -19013,6 +19018,24 @@
" display: inline-block;\n" +
" max-width: 100%;\n" +
"}\n" +
+":root.hats-enabled .catalog-thread::after {\n" +
+" content: '';\n" +
+" pointer-events: none;\n" +
+" position: absolute;\n" +
+" background-size: contain;\n" +
+"}\n" +
+":root.hats-enabled .catalog-small .catalog-thread::after {\n" +
+" left: -10px;\n" +
+" top: -65px;\n" +
+" width: 100px;\n" +
+" height: 100px;\n" +
+"}\n" +
+":root.hats-enabled .catalog-large .catalog-thread::after {\n" +
+" left: -15px;\n" +
+" top: -105px;\n" +
+" width: 160px;\n" +
+" height: 160px;\n" +
+"}\n" +
"/* Announcement Hiding */\n" +
":root.hide-announcement #globalMessage {\n" +
" display: none;\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index fcf11b52a..0db226912 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 5383c8441..11ac4d3b7 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.11.1
+// @version 1.11.11.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 0aa7f73e9..2587553da 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.11.11.1
+// @version 1.11.11.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -413,7 +413,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.11.1',
+ VERSION: '1.11.11.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3269,12 +3269,16 @@
return;
}
Index.hat = $('.board > .thread > img:first-child');
- if (Index.hat && Index.nodes) {
- ref6 = Index.nodes;
- for (u = 0, len3 = ref6.length; u < len3; u++) {
- threadRoot = ref6[u];
- $.prepend(threadRoot, Index.hat.cloneNode(false));
+ if (Index.hat) {
+ if (Index.nodes) {
+ ref6 = Index.nodes;
+ for (u = 0, len3 = ref6.length; u < len3; u++) {
+ threadRoot = ref6[u];
+ $.prepend(threadRoot, Index.hat.cloneNode(false));
+ }
}
+ $.addClass(doc, 'hats-enabled');
+ $.addStyle(".catalog-thread::after {background-image: url(" + Index.hat.src + ");}");
}
board = $('.board');
$.replace(board, Index.root);
@@ -18932,6 +18936,7 @@
" margin: 0 2px 5px;\n" +
" word-wrap: break-word;\n" +
" vertical-align: top;\n" +
+" position: relative;\n" +
"}\n" +
".catalog-thread > a {\n" +
" flex-shrink: 0;\n" +
@@ -19013,6 +19018,24 @@
" display: inline-block;\n" +
" max-width: 100%;\n" +
"}\n" +
+":root.hats-enabled .catalog-thread::after {\n" +
+" content: '';\n" +
+" pointer-events: none;\n" +
+" position: absolute;\n" +
+" background-size: contain;\n" +
+"}\n" +
+":root.hats-enabled .catalog-small .catalog-thread::after {\n" +
+" left: -10px;\n" +
+" top: -65px;\n" +
+" width: 100px;\n" +
+" height: 100px;\n" +
+"}\n" +
+":root.hats-enabled .catalog-large .catalog-thread::after {\n" +
+" left: -15px;\n" +
+" top: -105px;\n" +
+" width: 160px;\n" +
+" height: 160px;\n" +
+"}\n" +
"/* Announcement Hiding */\n" +
":root.hide-announcement #globalMessage {\n" +
" display: none;\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index d891f3b4e..d60c37dc8 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 98a4c8000..41b85b0ac 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 2fdc29b9c..f714f0a21 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index fc5a76ddc..97599f9ee 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
"meta": {
"name": "4chan X",
"fork": "ccd0",
- "version": "1.11.11.1",
- "date": "2015-09-28T17:54:23.729Z",
+ "version": "1.11.11.2",
+ "date": "2015-10-01T05:12:58.214Z",
"page": "https://www.4chan-x.net/",
"downloads": "https://www.4chan-x.net/builds/",
"oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",