Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 11:39:21 +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

1
dev/View/User/Login.js
View file

@ -115,7 +115,6 @@ export class LoginUserView extends AbstractViewLogin {
this.submitErrorAddidional((oData && oData.ErrorMessageAdditional) || '');
} else {
rl.setData(oData.Result);
// rl.route.reload();
}
},
data

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)
);
}

2
dev/View/User/Settings/Menu.js
View file

@ -18,6 +18,6 @@ export class MenuSettingsUserView extends AbstractViewLeft {
}
backToMailBoxClick() {
rl.route.setHash(mailbox(getFolderInboxName()));
hasher.setHash(mailbox(getFolderInboxName()));
}
}

2
dev/View/User/Settings/Pane.js
View file

@ -26,6 +26,6 @@ export class PaneSettingsUserView extends AbstractViewRight {
}
backToMailBoxClick() {
rl.route.setHash(mailbox(getFolderInboxName()));
hasher.setHash(mailbox(getFolderInboxName()));
}
}

8
dev/View/User/SystemDropDown.js
View file

@ -4,7 +4,7 @@ import { MessageUserStore } from 'Stores/User/Message';
//import { FolderUserStore } from 'Stores/User/Folder';
import { Capa, Scope } from 'Common/Enums';
import { root, settings } from 'Common/Links';
import { settings } from 'Common/Links';
import { showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewRight } from 'Knoin/AbstractViews';
@ -82,9 +82,7 @@ export class SystemDropDownUserView extends AbstractViewRight {
});
AccountUserStore.loading(false);
*/
// rl.route.reload();
location.href = root();
location.reload();
rl.route.reload();
}
}, {Email:account.email}
);
@ -97,7 +95,7 @@ export class SystemDropDownUserView extends AbstractViewRight {
}
settingsClick() {
rl.route.setHash(settings());
hasher.setHash(settings());
}
settingsHelp() {