From 9bae81cf88412eb06f15f449e70d9094f303e9c0 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 23 Mar 2015 18:48:08 -0700
Subject: [PATCH] Backport File Info Formatting changes.

- Original file info always goes after reformatted file info so DownThemAll works.
- Reformatted file info goes outside span.fileText on /f/, leaving original as first, so embedding works.
---
 src/General/css/style.css         |  1 +
 src/Miscellaneous/FileInfo.coffee | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/General/css/style.css b/src/General/css/style.css
index 3ab40b799..95f9e2577 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -946,6 +946,7 @@ span.hide-announcement {
 }
 
 /* File */
+.original-file-info,
 .fnswitch:hover > .fntrunc,
 .fnswitch:not(:hover) > .fnfull,
 .expanded-image > .post > .file > .fileThumb > video[data-md5],
diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee
index a14a1125a..daca6f626 100755
--- a/src/Miscellaneous/FileInfo.coffee
+++ b/src/Miscellaneous/FileInfo.coffee
@@ -5,13 +5,18 @@ FileInfo =
     Post.callbacks.push
       name: 'File Info Formatting'
       cb:   @node
+
   node: ->
     return if !@file or @isClone
-    @file.link.hidden = true
-    @file.link.previousSibling.nodeValue = @file.link.nextSibling.nodeValue = ''
-    info = $.el 'span', className: 'file-info'
-    $.after @file.link.nextSibling, info
+
+    oldInfo = $.el 'span', {className: 'original-file-info'}
+    $.prepend @file.link.parentNode, oldInfo
+    $.add oldInfo, [@file.link.previousSibling, @file.link, @file.link.nextSibling]
+
+    info = $.el 'span', {className: 'file-info'}
     FileInfo.format Conf['fileInfo'], @, info
+    $.prepend @file.text, info
+
   format: (formatString, post, outputNode) ->
     output = []
     formatString.replace /%(.)|[^%]+/g, (s, c) ->
@@ -21,6 +26,7 @@ FileInfo =
         <%= html('${s}') %>
       ''
     $.extend outputNode, <%= html('@{output}') %>
+
   formatters:
     t: -> <%= html('${this.file.URL.match(/[^\/]*$/)[0]}') %>
     T: -> <%= html('<a href="${this.file.URL}" target="_blank">&{FileInfo.formatters.t.call(this)}</a>') %>