diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4010f9b..64ff41c46 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.5
+**v1.10.5.5** *(2015-03-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.5/builds/4chan-X-noupdate.crx "Chromium version")]
+- Backport `File Info Formatting` fixes from v1.10.6.3.
+
**v1.10.5.4** *(2015-03-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.4/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix conflict with 4chan imgur thumbnail extension.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 6d1c8d4b7..9bc6707ce 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 befba26e7..a01a16d90 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.5.4
+// @version 1.10.5.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 b11eaa652..7904531bf 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.5.4
+// @version 1.10.5.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.5.4',
+ VERSION: '1.10.5.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14246,17 +14246,20 @@
});
},
node: function() {
- var info;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
- this.file.link.hidden = true;
- this.file.link.previousSibling.nodeValue = this.file.link.nextSibling.nodeValue = '';
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
- $.after(this.file.link.nextSibling, info);
- return FileInfo.format(Conf['fileInfo'], this, info);
+ FileInfo.format(Conf['fileInfo'], this, info);
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17916,6 +17919,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index a3cc361eb..cb686bd68 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 26785555a..077e26685 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.5.4
+// @version 1.10.5.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -394,7 +394,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.5.4',
+ VERSION: '1.10.5.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14245,17 +14245,20 @@
});
},
node: function() {
- var info;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
- this.file.link.hidden = true;
- this.file.link.previousSibling.nodeValue = this.file.link.nextSibling.nodeValue = '';
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
- $.after(this.file.link.nextSibling, info);
- return FileInfo.format(Conf['fileInfo'], this, info);
+ FileInfo.format(Conf['fileInfo'], this, info);
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17915,6 +17918,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 8b689133d..44da787ba 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 55636adfa..ff31ba57f 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.5.4
+// @version 1.10.5.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index f980be79f..451012922 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.5.4
+// @version 1.10.5.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.5.4',
+ VERSION: '1.10.5.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14246,17 +14246,20 @@
});
},
node: function() {
- var info;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
- this.file.link.hidden = true;
- this.file.link.previousSibling.nodeValue = this.file.link.nextSibling.nodeValue = '';
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
- $.after(this.file.link.nextSibling, info);
- return FileInfo.format(Conf['fileInfo'], this, info);
+ FileInfo.format(Conf['fileInfo'], this, info);
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17916,6 +17919,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 9cc184abc..94e848bec 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 2d9bbc4b6..e585ba024 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 a91f3e4ae..632e96f0b 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 289596427..2587e7e52 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.10.5.4",
- "date": "2015-03-23T10:46:22.268Z",
+ "version": "1.10.5.5",
+ "date": "2015-03-24T01:50:42.592Z",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",