From 2712a8b61e46a4715642397ff781ed9cc8fea5e0 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 15 Feb 2013 19:01:17 +0100 Subject: [PATCH] Prevent "-1 seconds ago" times. --- 4chan_x.user.js | 4 ++-- src/features.coffee | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8b82cb0ad..3398002c4 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3338,7 +3338,7 @@ }, relative: function(diff) { var number, rounded, unit; - unit = (number = diff / $.DAY) > 1 ? 'day' : (number = diff / $.HOUR) > 1 ? 'hour' : (number = diff / $.MINUTE) > 1 ? 'minute' : (number = diff / $.SECOND, 'second'); + unit = (number = diff / $.DAY) > 1 ? 'day' : (number = diff / $.HOUR) > 1 ? 'hour' : (number = diff / $.MINUTE) > 1 ? 'minute' : (number = Math.max(0, diff) / $.SECOND, 'second'); rounded = Math.round(number); if (rounded !== 1) { unit += 's'; @@ -3365,7 +3365,7 @@ var markStale, setOwnTimeout, update; setOwnTimeout = function(diff) { var delay; - delay = diff > $.HOUR ? diff % $.HOUR : diff > $.MINUTE ? diff % $.MINUTE : diff % $.SECOND; + delay = diff > $.DAY ? diff % $.DAY : diff > $.HOUR ? diff % $.HOUR : diff > $.MINUTE ? diff % $.MINUTE : diff % $.SECOND; return setTimeout(markStale, delay); }; update = function(now) { diff --git a/src/features.coffee b/src/features.coffee index 6c8d3d74c..061cffd3e 100644 --- a/src/features.coffee +++ b/src/features.coffee @@ -2030,7 +2030,8 @@ RelativeDates = else if (number = (diff / $.MINUTE)) > 1 'minute' else - number = diff / $.SECOND + # prevent "-1 seconds ago" + number = Math.max(0, diff) / $.SECOND 'second' rounded = Math.round number @@ -2064,7 +2065,9 @@ RelativeDates = # re-add `update()` to the stale list later. setUpdate: (post) -> setOwnTimeout = (diff) -> - delay = if diff > $.HOUR + delay = if diff > $.DAY + diff % $.DAY + else if diff > $.HOUR diff % $.HOUR else if diff > $.MINUTE diff % $.MINUTE