Merge branch 'master' into v3

This commit is contained in:
Nicolas Stepien 2013-03-07 23:34:30 +01:00
commit f34aaca331
3 changed files with 9 additions and 5 deletions

View File

@ -4354,7 +4354,7 @@
var markStale, setOwnTimeout, update;
setOwnTimeout = function(diff) {
var delay;
delay = diff < $.MINUTE ? diff % $.SECOND : diff < $.HOUR ? diff % $.MINUTE : diff < $.DAY ? diff % $.HOUR : diff % $.DAY;
delay = diff < $.MINUTE ? $.SECOND - (diff + $.SECOND / 2) % $.SECOND : diff < $.HOUR ? $.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE : diff < $.DAY ? $.HOUR - (diff + $.HOUR / 2) % $.HOUR : $.DAY - (diff + $.DAY / 2) % $.DAY;
return setTimeout(markStale, delay);
};
update = function(now) {

View File

@ -59,6 +59,10 @@ beta
Fix user ID highlighting on fetched posts.
master
2.39.0
- Queue
Fix rare bug in Relative Post Dates.
- Mayhem
Add Import/Export settings.

View File

@ -2897,13 +2897,13 @@ RelativeDates =
setUpdate: (post) ->
setOwnTimeout = (diff) ->
delay = if diff < $.MINUTE
diff % $.SECOND
$.SECOND - (diff + $.SECOND / 2) % $.SECOND
else if diff < $.HOUR
diff % $.MINUTE
$.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE
else if diff < $.DAY
diff % $.HOUR
$.HOUR - (diff + $.HOUR / 2) % $.HOUR
else
diff % $.DAY
$.DAY - (diff + $.DAY / 2) % $.DAY
setTimeout markStale, delay
update = (now) ->