From 6a8c28fdb7f8b0c85de787375055742e0fb5e098 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 20 Dec 2014 14:43:54 -0800 Subject: [PATCH] Merge ihavenoface's Relative Date Title implementation directly, rather than the prior coffee->js->coffee translation. #161 --- src/General/Config.coffee | 2 +- src/Miscellaneous/RelativeDates.coffee | 33 ++++++++++++-------------- 2 files changed, 16 insertions(+), 19 deletions(-) mode change 100755 => 100644 src/Miscellaneous/RelativeDates.coffee diff --git a/src/General/Config.coffee b/src/General/Config.coffee index e7deac964..b5a1f4773 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -47,7 +47,7 @@ Config = ] 'Relative Date Title': [ true - 'Show relative post date as the tooltip.' + 'Show Relative Post Date only when hovering over dates.' ] 'Comment Expansion': [ true diff --git a/src/Miscellaneous/RelativeDates.coffee b/src/Miscellaneous/RelativeDates.coffee old mode 100755 new mode 100644 index 699734aba..15c7eb9ca --- a/src/Miscellaneous/RelativeDates.coffee +++ b/src/Miscellaneous/RelativeDates.coffee @@ -1,29 +1,27 @@ RelativeDates = INTERVAL: $.MINUTE / 2 init: -> - switch g.VIEW - when 'index' - @flush() - $.on d, 'visibilitychange', @flush - return unless Conf['Relative Post Dates'] - when 'thread' - return unless Conf['Relative Post Dates'] - @flush() - $.on d, 'visibilitychange ThreadUpdate', @flush if g.VIEW is 'thread' - else - return + unless Conf['Relative Date Title'] + switch g.VIEW + when 'index' + @flush() + $.on d, 'visibilitychange', @flush + return unless Conf['Relative Post Dates'] + when 'thread' + return unless Conf['Relative Post Dates'] + @flush() + $.on d, 'visibilitychange ThreadUpdate', @flush if g.VIEW is 'thread' + else + return Post.callbacks.push name: 'Relative Post Dates' cb: @node - node: -> dateEl = @nodes.date if Conf['Relative Date Title'] - $.on dateEl, 'mouseover', => - RelativeDates.hover @ + $.on dateEl, 'mouseover', => RelativeDates.hover @ return - return if @isClone # Show original absolute time as tooltip so users can still know exact times @@ -88,10 +86,9 @@ RelativeDates = clearTimeout RelativeDates.timeout RelativeDates.timeout = setTimeout RelativeDates.flush, RelativeDates.INTERVAL - # Relative Date Title hover: (post) -> - {date} = post.info - now = new Date() + date = post.info.date + now = new Date() diff = now - date post.nodes.date.title = RelativeDates.relative diff, now, date