Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 13:39:22 +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

27
dev/Stores/User/Messagelist.js
View file

@ -31,7 +31,12 @@ import { SettingsUserStore } from 'Stores/User/Settings';
import Remote from 'Remote/User/Fetch';
const
isChecked = item => item.checked();
isChecked = item => item.checked(),
replaceHash = hash => {
rl.route.off();
hasher.replaceHash(hash);
rl.route.on();
}
export const MessagelistUserStore = ko.observableArray().extend({ debounce: 0 });
@ -69,7 +74,7 @@ addComputablesTo(MessagelistUserStore, {
mainSearch: {
read: MessagelistUserStore.listSearch,
write: value => rl.route.setHash(
write: value => hasher.setHash(
mailBox(FolderUserStore.currentFolderFullNameHash(), 1,
value.toString().trim(), MessagelistUserStore.threadUid())
)
@ -156,15 +161,13 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrenFolderCache
MessagelistUserStore.pageBeforeThread(1);
iOffset = 0;
rl.route.setHash(
replaceHash(
mailBox(
FolderUserStore.currentFolderFullNameHash(),
MessagelistUserStore.page(),
MessagelistUserStore.listSearch(),
MessagelistUserStore.threadUid()
),
true,
true
)
);
}
@ -400,14 +403,12 @@ MessagelistUserStore.removeMessagesFromList = (
setHash = 1;
} else {
MessagelistUserStore.threadUid(0);
rl.route.setHash(
replaceHash(
mailBox(
FolderUserStore.currentFolderFullNameHash(),
MessagelistUserStore.pageBeforeThread(),
MessagelistUserStore.listSearch()
),
true,
true
)
);
}
} else if (MessagelistUserStore.threadUid() != message.uid) {
@ -415,15 +416,13 @@ MessagelistUserStore.removeMessagesFromList = (
setHash = 1;
}
if (setHash) {
rl.route.setHash(
replaceHash(
mailBox(
FolderUserStore.currentFolderFullNameHash(),
MessagelistUserStore.page(),
MessagelistUserStore.listSearch(),
MessagelistUserStore.threadUid()
),
true,
true
)
);
}
}

2
dev/Stores/User/Notification.js
View file

@ -15,7 +15,7 @@ const HTML5Notification = window.Notification,
if (data.Folder && data.Uid) {
fireEvent('mailbox.message.show', data);
} else if (data.Url) {
rl.route.setHash(data.Url);
hasher.setHash(data.Url);
}
};