Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix and improved hasher routing

Browse source
This commit is contained in:
the-djmaze 2022-03-03 16:28:05 +01:00
parent 06e2dc722d
commit fafe56ecb4
16 changed files with 41 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/View/User/MailBox/FolderList.js
View file

@ -105,7 +105,7 @@ export class MailFolderList extends AbstractViewLeft {
setFolderHash(folder.fullName, '');
}
rl.route.setHash(
hasher.setHash(
mailBox(folder.fullNameHash, 1,
(event.target.matches('.flag-icon') && !folder.isFlagged()) ? 'flagged' : ''
)
@ -206,7 +206,7 @@ export class MailFolderList extends AbstractViewLeft {
}
configureFolders() {
rl.route.setHash(settings('folders'));
hasher.setHash(settings('folders'));
}
contactsClick() {

10
dev/View/User/MailBox/MessageList.js
View file

@ -230,14 +230,14 @@ export class MailMessageList extends AbstractViewRight {
);
if ('INBOX' === sFolder) {
rl.route.setHash(mailBox(sFolder));
hasher.setHash(mailBox(sFolder));
}
if (message) {
this.selector.selectMessageItem(message);
} else {
if ('INBOX' !== sFolder) {
rl.route.setHash(mailBox(sFolder));
hasher.setHash(mailBox(sFolder));
}
if (sFolder && iUid) {
MessageUserStore.message(MessageModel.fromMessageListItem(null));
@ -420,7 +420,7 @@ export class MailMessageList extends AbstractViewRight {
cancelThreadUid() {
// history.go(-1) better?
rl.route.setHash(
hasher.setHash(
mailBox(
FolderUserStore.currentFolderFullNameHash(),
MessagelistUserStore.pageBeforeThread(),
@ -590,7 +590,7 @@ export class MailMessageList extends AbstractViewRight {
}
gotoPage(page) {
page && rl.route.setHash(
page && hasher.setHash(
mailBox(
FolderUserStore.currentFolderFullNameHash(),
page.value,
@ -604,7 +604,7 @@ export class MailMessageList extends AbstractViewRight {
if (message && 0 < message.threadsLen()) {
MessagelistUserStore.pageBeforeThread(MessagelistUserStore.page());
rl.route.setHash(
hasher.setHash(
mailBox(FolderUserStore.currentFolderFullNameHash(), 1, MessagelistUserStore.listSearch(), message.uid)
);
}