From 6cf7373b938cf8d4841198584d7b709b45f27396 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 5 Aug 2013 21:19:20 +0200 Subject: [PATCH 1/2] Fix #1162. --- src/General/Build.coffee | 52 +++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 713e0586a..0d39bc343 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -27,6 +27,7 @@ Build = date: data.now dateUTC: data.time comment: data.com + capReps: data.capcode_replies # thread status isSticky: !!data.sticky isClosed: !!data.closed @@ -54,7 +55,7 @@ Build = postID, threadID, boardID name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC isSticky, isClosed - comment + comment, capReps file } = o isOP = postID is threadID @@ -172,22 +173,39 @@ Build = else fileHTML = '' - tripcode = - if tripcode - " #{tripcode}" - else - '' + tripcode = if tripcode + " #{tripcode}" + else + '' - sticky = - if isSticky - " Sticky" - else - '' - closed = - if isClosed - " Closed" - else - '' + sticky = if isSticky + " Sticky" + else + '' + closed = if isClosed + " Closed" + else + '' + + capcodeReplies = '' + if capReps + 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 ' ' + }
" + for capcodeType, array of capReps + capcodeReplies += generateCapcodeReplies capcodeType, array + capcodeReplies = "

#{capcodeReplies}" container = $.el 'div', id: "pc#{postID}" @@ -241,7 +259,7 @@ Build = (if isOP then '' else fileHTML) + - "
#{comment or ''}
" + + "
#{comment or ''}#{capcodeReplies}
" + '' From b36cf54d83874270cff0e4c41e350b6322e523dd Mon Sep 17 00:00:00 2001 From: Mayhem Date: Mon, 5 Aug 2013 23:30:39 +0200 Subject: [PATCH 2/2] Make use of a few CoffeeScript filters. --- lib/$.coffee | 3 +-- src/General/Header.coffee | 3 +-- src/General/Post.coffee | 3 +-- src/General/Settings.coffee | 3 +-- src/Posting/QR.coffee | 4 +--- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/$.coffee b/lib/$.coffee index 811614b78..59e08cbbd 100644 --- a/lib/$.coffee +++ b/lib/$.coffee @@ -24,8 +24,7 @@ $.formData = (form) -> if form instanceof HTMLFormElement return new FormData form fd = new FormData() - for key, val of form - continue unless val + for key, val of form when val # XXX GM bug # if val instanceof Blob if val.size and val.name diff --git a/src/General/Header.coffee b/src/General/Header.coffee index 5ba74529f..ae98518ed 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -199,8 +199,7 @@ Header = '#boardNavDesktopFoot a[href*="boards.4chan.org"]' ].join ', ' path = if useCatalog then 'catalog' else '' - for a in as - continue if a.dataset.only + for a in as when not a.dataset.only a.pathname = "/#{a.pathname.split('/')[1]}/#{path}" return toggleCatalogLinks: -> diff --git a/src/General/Post.coffee b/src/General/Post.coffee index 6da7f33dc..1b890c2ec 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -167,8 +167,7 @@ class Post return if file # Get quotelinks/backlinks to this post # and paint them (Dead). - for quotelink in Get.allQuotelinksLinkingTo @ - continue if $.hasClass quotelink, 'deadlink' + for quotelink in Get.allQuotelinksLinkingTo @ when not $.hasClass quotelink, 'deadlink' $.add quotelink, $.tn '\u00A0(Dead)' $.addClass quotelink, 'deadlink' return diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index d0360db9e..660d78f78 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -277,8 +277,7 @@ Settings = '%board' else c - for key, val of Config.hotkeys - continue unless key of data.Conf + for key, val of Config.hotkeys when key of data.Conf data.Conf[key] = data.Conf[key].replace(/ctrl|alt|meta/g, (s) -> "#{s[0].toUpperCase()}#{s[1..]}").replace /(^|.+\+)[A-Z]$/g, (s) -> "Shift+#{s[0...-1]}#{s[-1..].toLowerCase()}" data.Conf.WatchedThreads = data.WatchedThreads diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index c77bdda1e..791e7ded0 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -176,9 +176,7 @@ QR = types[type].push val loadPersonas: (type, arr) -> list = $ "#list-#{type}", QR.nodes.el - for val in arr - # XXX Firefox displays empty