suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeago: assume "now" when date is in the future

Browse Source
This commit is contained in:
Sven Fuchs 2013-11-05 15:48:30 +01:00
parent abe16b3c3b
commit 6d52827576
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/scripts/vendor/jquery.timeago.js vendored
View File

@ -24,7 +24,7 @@
$.extend($.timeago, { $.extend($.timeago, {
settings: { settings: {
refreshMillis: 3000, refreshMillis: 3000,
allowFuture: true, allowFuture: false,
strings: { strings: {
prefixAgo: null, prefixAgo: null,
prefixFromNow: null, prefixFromNow: null,
@ -64,6 +64,10 @@
suffix = $l.suffixFromNow; suffix = $l.suffixFromNow;
} }
distanceMillis = Math.abs(distanceMillis); distanceMillis = Math.abs(distanceMillis);
} else {
if (distanceMillis < 0) {
distanceMillis = 0;
}
} }
var seconds = distanceMillis / 1000; var seconds = distanceMillis / 1000;
@ -78,9 +82,9 @@
return string.replace(/%d/i, value); return string.replace(/%d/i, value);
} }
var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || var words = seconds < 55 && substitute($l.seconds, Math.round(seconds)) ||
seconds < 90 && substitute($l.minute, 1) || seconds < 90 && substitute($l.minute, 1) ||
minutes < 45 && substitute($l.minutes, Math.round(minutes)) || minutes < 55 && substitute($l.minutes, Math.round(minutes)) ||
minutes < 90 && substitute($l.hour, 1) || minutes < 90 && substitute($l.hour, 1) ||
hours < 24 && substitute($l.hours, Math.round(hours)) || hours < 24 && substitute($l.hours, Math.round(hours)) ||
hours < 48 && substitute($l.day, 1) || hours < 48 && substitute($l.day, 1) ||