diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 0cbe5929f..783a774f5 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -27,7 +27,6 @@ Build = date: data.now dateUTC: data.time comment: data.com - capcodeReplies: data.capcode_replies # thread status isSticky: !!data.sticky isClosed: !!data.closed @@ -55,7 +54,7 @@ Build = postID, threadID, boardID name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC isSticky, isClosed - comment, capcodeReplies + comment file } = o isOP = postID is threadID @@ -248,36 +247,4 @@ Build = continue if href[0] is '/' # Cross-board quote, or board link quote.href = "/#{boardID}/res/#{href}" # Fix pathnames - Build.capcodeReplies {boardID, threadID, root: container, capcodeReplies} - container - - capcodeReplies: ({boardID, threadID, bq, root, capcodeReplies}) -> - return unless capcodeReplies - - generateCapcodeReplies = (capcodeType, array) -> - "#{ - switch capcodeType - when 'admin' - 'Administrator' - when 'mod' - 'Moderator' - when 'developer' - 'Developer' - } Repl#{if array.length > 1 then 'ies' else 'y'}: #{ - array.map (ID) -> - ">>#{ID}" - .join ' ' - }
" - 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 '' - ] diff --git a/src/General/Post.coffee b/src/General/Post.coffee index c792efa81..0d2cbc293 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -62,13 +62,12 @@ class Post #
-> \n # Remove: # 'Comment too long'... - # Admin/Mod/Dev replies. (/q/) # EXIF data. (/p/) # Rolls. (/tg/) # Preceding and following new lines. # Trailing spaces. bq = @nodes.comment.cloneNode true - for node in $$ '.abbr, .capcodeReplies, .exif, b', bq + for node in $$ '.abbr, .exif, b', bq $.rm node text = [] # XPathResult.ORDERED_NODE_SNAPSHOT_TYPE === 7 @@ -100,8 +99,7 @@ class Post @nodes.quotelinks.push quotelink - # Don't count capcode replies as quotes in OPs. (Admin/Mod/Dev Replies: ...) - return if @isClone or !@isReply and $.hasClass quotelink.parentNode.parentNode, 'capcodeReplies' + return if @isClone # ES6 Set when? fullID = "#{match[1]}.#{match[2]}" diff --git a/src/Miscellaneous/ExpandComment.coffee b/src/Miscellaneous/ExpandComment.coffee index 3567e9f84..e292d65ad 100644 --- a/src/Miscellaneous/ExpandComment.coffee +++ b/src/Miscellaneous/ExpandComment.coffee @@ -48,11 +48,6 @@ ExpandComment = href = quote.getAttribute 'href' continue if href[0] is '/' # Cross-board quote, or board link 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 $.replace comment, clone post.nodes.comment = post.nodes.longComment = clone