Prevent "-1 seconds ago" times.
This commit is contained in:
parent
2022962dda
commit
2712a8b61e
@ -3338,7 +3338,7 @@
|
|||||||
},
|
},
|
||||||
relative: function(diff) {
|
relative: function(diff) {
|
||||||
var number, rounded, unit;
|
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);
|
rounded = Math.round(number);
|
||||||
if (rounded !== 1) {
|
if (rounded !== 1) {
|
||||||
unit += 's';
|
unit += 's';
|
||||||
@ -3365,7 +3365,7 @@
|
|||||||
var markStale, setOwnTimeout, update;
|
var markStale, setOwnTimeout, update;
|
||||||
setOwnTimeout = function(diff) {
|
setOwnTimeout = function(diff) {
|
||||||
var delay;
|
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);
|
return setTimeout(markStale, delay);
|
||||||
};
|
};
|
||||||
update = function(now) {
|
update = function(now) {
|
||||||
|
|||||||
@ -2030,7 +2030,8 @@ RelativeDates =
|
|||||||
else if (number = (diff / $.MINUTE)) > 1
|
else if (number = (diff / $.MINUTE)) > 1
|
||||||
'minute'
|
'minute'
|
||||||
else
|
else
|
||||||
number = diff / $.SECOND
|
# prevent "-1 seconds ago"
|
||||||
|
number = Math.max(0, diff) / $.SECOND
|
||||||
'second'
|
'second'
|
||||||
|
|
||||||
rounded = Math.round number
|
rounded = Math.round number
|
||||||
@ -2064,7 +2065,9 @@ RelativeDates =
|
|||||||
# re-add `update()` to the stale list later.
|
# re-add `update()` to the stale list later.
|
||||||
setUpdate: (post) ->
|
setUpdate: (post) ->
|
||||||
setOwnTimeout = (diff) ->
|
setOwnTimeout = (diff) ->
|
||||||
delay = if diff > $.HOUR
|
delay = if diff > $.DAY
|
||||||
|
diff % $.DAY
|
||||||
|
else if diff > $.HOUR
|
||||||
diff % $.HOUR
|
diff % $.HOUR
|
||||||
else if diff > $.MINUTE
|
else if diff > $.MINUTE
|
||||||
diff % $.MINUTE
|
diff % $.MINUTE
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user