From 0280214f439b1ced79ef99a7d60bc12671e0dd69 Mon Sep 17 00:00:00 2001
From: Mayhem <stepien.nicolas@gmail.com>
Date: Sun, 20 Apr 2014 01:19:53 +0200
Subject: [PATCH] Fix file text building, and spoiler filename parsing.

---
 CHANGELOG.md             |  2 ++
 src/General/Build.coffee | 10 +++-------
 src/General/Post.coffee  |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 168d2f261..c0ec3f2b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Even more bug fixes.
+
 ### 3.20.7 - *2014-04-20*
 
 - More bug fixes.
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index fa015b1b5..a2c67bca7 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -155,13 +155,9 @@ Build =
       filename      = a.innerHTML.replace /'/g, '&apos;'
 
       fileDims = if file.name[-3..] is 'pdf' then 'PDF' else "#{file.width}x#{file.height}"
-      fileInfo = "<div class=fileText#{if file.isSpoiler then " title='#{filename}'" else ''}>File: <a href='#{file.url}' target=_blank>#{file.timestamp}</a>" +
-        "-(#{fileSize}, #{fileDims}#{
-          if file.isSpoiler
-            ''
-          else
-            ", <span#{if filename isnt shortFilename then " title='#{filename}'" else ''}>#{shortFilename}</span>"
-        }" + ")</div>"
+      fileInfo = "<div class=fileText #{if file.isSpoiler then "title='#{filename}'" else ''}>File: " +
+        "<a href='#{file.url}' #{if filename isnt shortFilename and !file.isSpoiler then " title='#{filename}'" else ''} target=_blank>#{if file.isSpoiler then 'Spoiler Image' else shortFilename}</a>" +
+        " (#{fileSize}, #{fileDims})</div>"
 
       fileHTML = "<div class=file>#{fileInfo}#{imgSrc}</div>"
     else
diff --git a/src/General/Post.coffee b/src/General/Post.coffee
index 7c4449013..ff573a02a 100644
--- a/src/General/Post.coffee
+++ b/src/General/Post.coffee
@@ -132,7 +132,7 @@ class Post
       thumb.src
     else
       "#{location.protocol}//t.4cdn.org/#{@board}/#{@file.URL.match(/(\d+)\./)[1]}s.jpg"
-    @file.name = if nameNode = $ 'a', fileText
+    @file.name = if !@file.isSpoiler and nameNode = $ 'a', fileText
       nameNode.title or nameNode.textContent
     else
       fileText.title