Prevent "-1 seconds ago" times.

This commit is contained in:
Nicolas Stepien 2013-02-15 19:01:17 +01:00
parent 2022962dda
commit 2712a8b61e
2 changed files with 7 additions and 4 deletions

View File

@ -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) {

View File

@ -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