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

Fix search route

Browse source
This commit is contained in:
RainLoop Team 2013-12-16 02:02:03 +04:00
parent b7c4aad3db
commit ecbe0011fb
8 changed files with 157 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dev/Screens/MailBox.js
View file

@ -54,19 +54,19 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch)
if (oFolder)
{
oData
.currentFolder(oFolder)
.messageListPage(iPage)
.messageListSearch(sSearch)
;
oData
.currentFolder(oFolder)
.messageListPage(iPage)
.messageListSearch(sSearch)
;
if (!oData.usePreviewPane() && oData.message())
{
oData.message(null);
if (!oData.usePreviewPane() && oData.message())
{
oData.message(null);
}
RL.reloadMessageList();
}
RL.reloadMessageList();
}
};
MailBoxScreen.prototype.onStart = function ()
@ -158,7 +158,8 @@ MailBoxScreen.prototype.routes = function ()
;
return [
[/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)\/?$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}],
[/^([a-zA-Z0-9]+)\/(.+)\/?$/, {'normalize_': fNormD}],
[/^([^\/]*)$/, {'normalize_': fNormS}]
];