- #{if isOP then fileHTML else ''}
+ #{if isOP then h_file else ''}
-
-
- #{' '}
#{subject or ''}#{' '}
-
- #{emailStart}
- #{name or ''}
- #{tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag}
- #{" "}
-
#{date}#{' '}
+
+
+ #{' '}
#{E subject}#{' '}
+
+ #{h_emailStart}
+ #{E name}
+ #{h_tripcode}#{h_capcodeStart}#{h_emailEnd}#{h_capcodeIcon}#{h_userID}#{h_flag}
+ #{' '}
+
#{E date}#{' '}
- No.
- #{postID}
- #{pageIcon + sticky + closed + replyLink}
+ No.
+ #{+postID}
+ #{h_pageIcon}#{h_sticky}#{h_closed}#{h_replyLink}
- #{if isOP then '' else fileHTML}
+ #{if isOP then '' else h_file}
-
#{comment or ''}
#{' '}
+
#{h_comment}
#{' '}
"""
diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee
index 2f89bbb26..4ec8b6183 100755
--- a/src/Miscellaneous/FileInfo.coffee
+++ b/src/Miscellaneous/FileInfo.coffee
@@ -7,39 +7,29 @@ FileInfo =
cb: @node
node: ->
return if !@file or @isClone
- @file.text.innerHTML = "
#{FileInfo.format Conf['fileInfo'], @}"
- format: (formatString, post) ->
+ @file.text.innerHTML = "
#{FileInfo.h_format Conf['fileInfo'], @}"
+ h_format: (formatString, post) ->
formatString.replace /%([A-Za-z])|[^%]+/g, (s, c) ->
- if c of FileInfo.formatters
- FileInfo.formatters[c].call(post)
+ if c of FileInfo.h_formatters
+ FileInfo.h_formatters[c].call(post)
else
- Build.escape s
- convertUnit: (size, unit) ->
- if unit is 'B'
- return "#{size.toFixed()} Bytes"
- i = 1 + ['KB', 'MB'].indexOf unit
- size /= 1024 while i--
- size = if unit is 'MB'
- Math.round(size * 100) / 100
- else
- size.toFixed()
- "#{size} #{unit}"
- formatters:
- t: -> Build.escape @file.URL.match(/\d+\..+$/)[0]
- T: -> "
#{FileInfo.formatters.t.call @}"
- l: -> "
#{FileInfo.formatters.n.call @}"
- L: -> "
#{FileInfo.formatters.N.call @}"
+ Build.h_escape s
+ h_formatters:
+ t: -> Build.h_escape @file.URL.match(/\d+\..+$/)[0]
+ T: -> "
#{FileInfo.h_formatters.t.call @}"
+ l: -> "
#{FileInfo.h_formatters.n.call @}"
+ L: -> "
#{FileInfo.h_formatters.N.call @}"
n: ->
fullname = @file.name
shortname = Build.shortFilename @file.name, @isReply
if fullname is shortname
- Build.escape fullname
+ Build.h_escape fullname
else
- "
#{Build.escape shortname}#{Build.escape fullname}"
- N: -> Build.escape @file.name
+ "
#{Build.h_escape shortname}#{Build.h_escape fullname}"
+ N: -> Build.h_escape @file.name
p: -> if @file.isSpoiler then 'Spoiler, ' else ''
- s: -> Build.escape @file.size
- B: -> FileInfo.convertUnit @file.sizeInBytes, 'B'
- K: -> FileInfo.convertUnit @file.sizeInBytes, 'KB'
- M: -> FileInfo.convertUnit @file.sizeInBytes, 'MB'
- r: -> Build.escape (@file.dimensions or 'PDF')
+ s: -> Build.h_escape @file.size
+ B: -> return "#{+@file.sizeInBytes} Bytes"
+ K: -> "#{+Math.round(@file.sizeInBytes/1024)} KB"
+ M: -> "#{+Math.round(@file.sizeInBytes/1048576*100)/100} MB"
+ r: -> Build.h_escape (@file.dimensions or 'PDF')
}.gif "#{flagName}")
"
+ if !capcode and uniqueID
+ h_userID = " (ID: #{E uniqueID}) "
else
- " "
+ h_userID = ''
+
+ unless flagCode
+ h_flag = ''
+ else if boardID is 'pol'
+ h_flag = " }.gif "#{E flagName}")
"
+ else
+ h_flag = " "
if file?.isDeleted
- fileHTML = if isOP
- "