1
0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00

Implement time gap indicators

Get rid of short human times (1m, 1h, 1d) for now
This commit is contained in:
Toby Zerner
2015-06-19 10:00:19 +09:30
parent 6ca48e016f
commit a45729805d
3 changed files with 29 additions and 18 deletions

View File

@@ -154,6 +154,8 @@ class PostStream extends mixin(Component, evented) {
context.fadedIn = true;
}
var lastTime;
return m('div.discussion-posts.posts', {config: this.onload.bind(this)},
this.posts.map((post, i) => {
var content;
@@ -166,6 +168,15 @@ class PostStream extends mixin(Component, evented) {
attributes.config = fadeIn;
attributes['data-time'] = post.time().toISOString();
attributes['data-number'] = post.number();
var dt = post.time() - lastTime;
if (dt > 1000 * 60 * 60 * 24 * 4) {
content = [
m('div.time-gap', m('span', moment.duration(dt).humanize(), ' later')),
content
];
}
lastTime = post.time();
} else {
content = PostLoading.component();
}

View File

@@ -1,21 +1,3 @@
moment.locale('en', {
relativeTime : {
future: "in %s",
past: "%s ago",
s: "seconds",
m: "1m",
mm: "%dm",
h: "1h",
hh: "%dh",
d: "1d",
dd: "%dd",
M: "a month",
MM: "%d months",
y: "a year",
yy: "%d years"
}
});
export default function humanTime(time) {
var m = moment(time);