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

Bugfix: mailbox search pagination failed

Browse source
This commit is contained in:
djmaze 2021-02-12 14:57:18 +01:00
parent 997e0561ad
commit 8c33b17882
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/Screen/User/MailBox.js
View file

@ -76,7 +76,7 @@ export class MailBoxUserScreen extends AbstractScreen {
onRoute(folderHash, page, search) { onRoute(folderHash, page, search) {
const folder = getFolderFromCacheList(getFolderFullNameRaw(folderHash.replace(/~([\d]+)$/, ''))); const folder = getFolderFromCacheList(getFolderFullNameRaw(folderHash.replace(/~([\d]+)$/, '')));
if (folder) { if (folder) {
let threadUid = folderHash.replace(/^(.+)~([\d]+)$/, '$2'); let threadUid = folderHash.replace(/^.+~([\d]+)$/, '$1');
if (folderHash === threadUid) { if (folderHash === threadUid) {
threadUid = ''; threadUid = '';
} }
@ -135,13 +135,13 @@ export class MailBoxUserScreen extends AbstractScreen {
const const
fNormS = (request, vals) => { fNormS = (request, vals) => {
if (request) { if (request) {
vals[0] = pString(vals[0]); vals[0] = decodeURI(pString(vals[0]));
vals[1] = pInt(vals[1]); vals[1] = pInt(vals[1]);
} else { } else {
vals[0] = getFolderInboxName(); vals[0] = getFolderInboxName();
vals[1] = 1; vals[1] = 1;
} }
return [decodeURI(vals[0]), 1 > vals[1] ? 1 : vals[1], decodeURI(pString(vals[2]))]; return [vals[0], 1 > vals[1] ? 1 : vals[1], decodeURI(pString(vals[2]))];
}, },
fNormD = (request, vals) => fNormD = (request, vals) =>
[decodeURI(request ? pString(vals[0]) : getFolderInboxName()), 1, decodeURI(pString(vals[1]))]; [decodeURI(request ? pString(vals[0]) : getFolderInboxName()), 1, decodeURI(pString(vals[1]))];
@ -149,7 +149,7 @@ export class MailBoxUserScreen extends AbstractScreen {
return [ return [
[/^([^/]*)$/, { 'normalize_': fNormS }], [/^([^/]*)$/, { 'normalize_': fNormS }],
[/^([a-zA-Z0-9~]+)\/(.+)\/?$/, { 'normalize_': fNormD }], [/^([a-zA-Z0-9~]+)\/(.+)\/?$/, { 'normalize_': fNormD }],
[/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)(\/(.+)\/?)?$/, { 'normalize_': fNormS }] [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)(?:\/(.+)\/?)?$/, { 'normalize_': fNormS }]
]; ];
} }
} }