mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-07 16:37:02 +03:00
Resolve #843
This commit is contained in:
parent
d41f9d8eee
commit
98996ba4b7
3 changed files with 6 additions and 4 deletions
|
|
@ -107,7 +107,7 @@ export const
|
||||||
switch (formatStr) {
|
switch (formatStr) {
|
||||||
case 'FROMNOW':
|
case 'FROMNOW':
|
||||||
return fromNow(m);
|
return fromNow(m);
|
||||||
case 'SHORT': {
|
case 'AUTO': {
|
||||||
// 4 hours
|
// 4 hours
|
||||||
if (14400000 >= now - time)
|
if (14400000 >= now - time)
|
||||||
return fromNow(m);
|
return fromNow(m);
|
||||||
|
|
@ -119,7 +119,9 @@ export const
|
||||||
{TIME: m.format('LT',0,h)}
|
{TIME: m.format('LT',0,h)}
|
||||||
)
|
)
|
||||||
: m.format(
|
: m.format(
|
||||||
date.getFullYear() === m.getFullYear() ? {day: '2-digit', month: 'short'} : {dateStyle: 'medium'}
|
date.getFullYear() === m.getFullYear()
|
||||||
|
? {day: '2-digit', month: 'short', hour: 'numeric', minute: 'numeric'}
|
||||||
|
: {dateStyle: 'medium', timeStyle: 'short'}
|
||||||
, 0, h);
|
, 0, h);
|
||||||
}
|
}
|
||||||
case 'FULL':
|
case 'FULL':
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ export class MailMessageList extends AbstractViewRight {
|
||||||
return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid;
|
return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid;
|
||||||
},
|
},
|
||||||
|
|
||||||
timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'SHORT' : 'LT',
|
timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'AUTO' : 'LT',
|
||||||
|
|
||||||
groupedList: () => {
|
groupedList: () => {
|
||||||
let list = [], current, sort = FolderUserStore.sortMode() || 'DATE';
|
let list = [], current, sort = FolderUserStore.sortMode() || 'DATE';
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
|
<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
|
||||||
<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLen"></div>
|
<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLen"></div>
|
||||||
<time class="actionHandle" data-moment-format="SHORT" data-bind="moment: dateTimeStampInUTC"></time>
|
<time class="actionHandle" data-moment-format="AUTO" data-bind="moment: dateTimeStampInUTC"></time>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue