From 7df0fd141416b2d9cd387cb505c66bba110e5e94 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 15 Feb 2014 22:24:10 +0100 Subject: [PATCH] Simplify QuoteMarkers.parseQuotelink arguments. --- src/General/Post.coffee | 8 ++------ src/Quotelinks/QuoteBacklink.coffee | 2 +- src/Quotelinks/QuoteMarkers.coffee | 6 +++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index 2226ff64b..b88c12cd6 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -179,9 +179,7 @@ class Post for quotelink in Get.allQuotelinksLinkingTo @ when not $.hasClass quotelink, 'deadlink' $.addClass quotelink, 'deadlink' continue unless Conf['Quote Markers'] - post = Get.postFromNode quotelink - {board, thread} = if post.isClone then post.context else post - QuoteMarkers.parseQuotelink board, thread, post, quotelink, true + QuoteMarkers.parseQuotelink Get.postFromNode(quotelink), quotelink, true return # XXX tmp fix for 4chan's racing condition # giving us false-positive dead posts. @@ -203,9 +201,7 @@ class Post for quotelink in Get.allQuotelinksLinkingTo @ when $.hasClass quotelink, 'deadlink' $.rmClass quotelink, 'deadlink' continue unless Conf['Quote Markers'] - post = Get.postFromNode quotelink - {board, thread} = if post.isClone then post.context else post - QuoteMarkers.parseQuotelink board, thread, post, quotelink, true + QuoteMarkers.parseQuotelink Get.postFromNode(quotelink), quotelink, true return collect: -> diff --git a/src/Quotelinks/QuoteBacklink.coffee b/src/Quotelinks/QuoteBacklink.coffee index ead8fe676..e45a2a4c8 100644 --- a/src/Quotelinks/QuoteBacklink.coffee +++ b/src/Quotelinks/QuoteBacklink.coffee @@ -53,7 +53,7 @@ QuoteBacklink = if post.isHidden $.addClass a, 'filtered' if Conf['Quote Markers'] - QuoteMarkers.parseQuotelink post.board, post.thread, post, a, false, text + QuoteMarkers.parseQuotelink post, a, false, text if Conf['Quote Previewing'] $.on a, 'mouseover', QuotePreview.mouseover if Conf['Quote Inlining'] diff --git a/src/Quotelinks/QuoteMarkers.coffee b/src/Quotelinks/QuoteMarkers.coffee index 60433f7b6..fe6a66d4a 100644 --- a/src/Quotelinks/QuoteMarkers.coffee +++ b/src/Quotelinks/QuoteMarkers.coffee @@ -6,11 +6,11 @@ QuoteMarkers = name: 'Quote Markers' cb: @node node: -> - {board, thread} = if @isClone then @context else @ for quotelink in @nodes.quotelinks - QuoteMarkers.parseQuotelink board, thread, @, quotelink, !!@isClone + QuoteMarkers.parseQuotelink @, quotelink, !!@isClone return - parseQuotelink: (board, thread, post, quotelink, mayReset, customText) -> + parseQuotelink: (post, quotelink, mayReset, customText) -> + {board, thread} = if post.isClone then post.context else post markers = [] {boardID, threadID, postID} = Get.postDataFromLink quotelink