From e3376c244e2a31f6ca86aab0bb242ab970eb07a9 Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 10 Feb 2021 13:12:27 +0100 Subject: [PATCH] Bugfix: pagination failed because Crossroads routes with higher priority are added last --- dev/Screen/User/MailBox.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index 111a3ff7b..e04b8d2ec 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -147,10 +147,9 @@ export class MailBoxUserScreen extends AbstractScreen { [decodeURI(request ? pString(vals[0]) : getFolderInboxName()), 1, decodeURI(pString(vals[1]))]; return [ - [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, { 'normalize_': fNormS }], - [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, { 'normalize_': fNormS }], + [/^([^/]*)$/, { 'normalize_': fNormS }], [/^([a-zA-Z0-9~]+)\/(.+)\/?$/, { 'normalize_': fNormD }], - [/^([^/]*)$/, { 'normalize_': fNormS }] + [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)(\/(.+)\/?)?$/, { 'normalize_': fNormS }] ]; } }