Fix #1162.
This commit is contained in:
parent
4037133eb5
commit
fbe724a174
@ -27,7 +27,7 @@ Build =
|
|||||||
date: data.now
|
date: data.now
|
||||||
dateUTC: data.time
|
dateUTC: data.time
|
||||||
comment: data.com
|
comment: data.com
|
||||||
capReps: data.capcode_replies
|
capcodeReplies: data.capcode_replies
|
||||||
# thread status
|
# thread status
|
||||||
isSticky: !!data.sticky
|
isSticky: !!data.sticky
|
||||||
isClosed: !!data.closed
|
isClosed: !!data.closed
|
||||||
@ -55,7 +55,7 @@ Build =
|
|||||||
postID, threadID, boardID
|
postID, threadID, boardID
|
||||||
name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC
|
name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC
|
||||||
isSticky, isClosed
|
isSticky, isClosed
|
||||||
comment, capReps
|
comment, capcodeReplies
|
||||||
file
|
file
|
||||||
} = o
|
} = o
|
||||||
isOP = postID is threadID
|
isOP = postID is threadID
|
||||||
@ -187,26 +187,6 @@ Build =
|
|||||||
else
|
else
|
||||||
''
|
''
|
||||||
|
|
||||||
capcodeReplies = ''
|
|
||||||
if capReps
|
|
||||||
generateCapcodeReplies = (capcodeType, array) ->
|
|
||||||
"<span class=smaller><span class=bold>#{
|
|
||||||
switch capcodeType
|
|
||||||
when 'admin'
|
|
||||||
'Administrator'
|
|
||||||
when 'mod'
|
|
||||||
'Moderator'
|
|
||||||
when 'developer'
|
|
||||||
'Developer'
|
|
||||||
} Repl#{if array.length > 1 then 'ies' else 'y'}:</span> #{
|
|
||||||
array.map (ID) ->
|
|
||||||
"<a href='/#{boardID}/res/#{threadID}#p#{ID}' class=quotelink>>>#{ID}</a>"
|
|
||||||
.join ' '
|
|
||||||
}</span><br>"
|
|
||||||
for capcodeType, array of capReps
|
|
||||||
capcodeReplies += generateCapcodeReplies capcodeType, array
|
|
||||||
capcodeReplies = "<br><br><span class=capcodeReplies>#{capcodeReplies}</span>"
|
|
||||||
|
|
||||||
container = $.el 'div',
|
container = $.el 'div',
|
||||||
id: "pc#{postID}"
|
id: "pc#{postID}"
|
||||||
className: "postContainer #{if isOP then 'op' else 'reply'}Container"
|
className: "postContainer #{if isOP then 'op' else 'reply'}Container"
|
||||||
@ -259,7 +239,7 @@ Build =
|
|||||||
|
|
||||||
(if isOP then '' else fileHTML) +
|
(if isOP then '' else fileHTML) +
|
||||||
|
|
||||||
"<blockquote class=postMessage id=m#{postID}>#{comment or ''}#{capcodeReplies}</blockquote> " +
|
"<blockquote class=postMessage id=m#{postID}>#{comment or ''}</blockquote> " +
|
||||||
|
|
||||||
'</div>'
|
'</div>'
|
||||||
|
|
||||||
@ -268,4 +248,36 @@ Build =
|
|||||||
continue if href[0] is '/' # Cross-board quote, or board link
|
continue if href[0] is '/' # Cross-board quote, or board link
|
||||||
quote.href = "/#{boardID}/res/#{href}" # Fix pathnames
|
quote.href = "/#{boardID}/res/#{href}" # Fix pathnames
|
||||||
|
|
||||||
|
Build.capcodeReplies {boardID, threadID, root: container, capcodeReplies}
|
||||||
|
|
||||||
container
|
container
|
||||||
|
|
||||||
|
capcodeReplies: ({boardID, threadID, bq, root, capcodeReplies}) ->
|
||||||
|
return unless capcodeReplies
|
||||||
|
|
||||||
|
generateCapcodeReplies = (capcodeType, array) ->
|
||||||
|
"<span class=smaller><span class=bold>#{
|
||||||
|
switch capcodeType
|
||||||
|
when 'admin'
|
||||||
|
'Administrator'
|
||||||
|
when 'mod'
|
||||||
|
'Moderator'
|
||||||
|
when 'developer'
|
||||||
|
'Developer'
|
||||||
|
} Repl#{if array.length > 1 then 'ies' else 'y'}:</span> #{
|
||||||
|
array.map (ID) ->
|
||||||
|
"<a href='/#{boardID}/res/#{threadID}#p#{ID}' class=quotelink>>>#{ID}</a>"
|
||||||
|
.join ' '
|
||||||
|
}</span><br>"
|
||||||
|
html = []
|
||||||
|
for capcodeType, array of capcodeReplies
|
||||||
|
html.push generateCapcodeReplies capcodeType, array
|
||||||
|
|
||||||
|
bq or= $ 'blockquote', root
|
||||||
|
$.add bq, [
|
||||||
|
$.el 'br'
|
||||||
|
$.el 'br'
|
||||||
|
$.el 'span',
|
||||||
|
className: 'capcodeReplies'
|
||||||
|
innerHTML: html.join ''
|
||||||
|
]
|
||||||
|
|||||||
@ -49,6 +49,11 @@ ExpandComment =
|
|||||||
href = quote.getAttribute 'href'
|
href = quote.getAttribute 'href'
|
||||||
continue if href[0] is '/' # Cross-board quote, or board link
|
continue if href[0] is '/' # Cross-board quote, or board link
|
||||||
quote.href = "/#{post.board}/res/#{href}" # Fix pathnames
|
quote.href = "/#{post.board}/res/#{href}" # Fix pathnames
|
||||||
|
Build.capcodeReplies
|
||||||
|
boardID: post.board.ID
|
||||||
|
threadID: post.thread.ID
|
||||||
|
bq: clone
|
||||||
|
capcodeReplies: postObj.capcode_replies
|
||||||
post.nodes.shortComment = comment
|
post.nodes.shortComment = comment
|
||||||
$.replace comment, clone
|
$.replace comment, clone
|
||||||
post.nodes.comment = post.nodes.longComment = clone
|
post.nodes.comment = post.nodes.longComment = clone
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user