diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-28 08:48:12 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-28 08:48:12 -0700 |
| commit | 953e27cdf7037a70b9c5b7ba7cd94aab40f17de9 (patch) | |
| tree | f56228231b1877bc09d992620c53cee013e00a26 /web/react/utils/utils.jsx | |
| parent | 46e2e3ebd9180e0ccbfa7335a586215cf9051b4d (diff) | |
| parent | c6f3361d3caf671ca64b798d5ac9eca97c387f9e (diff) | |
| download | chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.tar.gz chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.tar.bz2 chat-953e27cdf7037a70b9c5b7ba7cd94aab40f17de9.zip | |
Merge branch 'master' into PLT-340
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fadab27a7..3140a5d77 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -211,11 +211,15 @@ export function displayDateTime(ticks) { } interval = Math.floor(seconds / 60); - if (interval > 1) { + if (interval >= 2) { return interval + ' minutes ago'; } - return '1 minute ago'; + if (interval >= 1) { + return '1 minute ago'; + } + + return 'just now'; } export function displayCommentDateTime(ticks) { |