amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix some operations in advanced mail search

Browse Source 
Fixes #4478
This commit is contained in:
Francis Lachapelle
2018-06-14 22:20:24 -04:00
parent 70d0408230
commit a69a5b77be
6 changed files with 104 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MessageController.js
+10 -4
View File
@@ -215,6 +215,9 @@
message = stateMessage;
state = $state;
}
if (Mailbox.$virtualMode) {
mailbox = Mailbox.selectedFolder; // the VirtualMailbox instance
}
mailbox.$deleteMessages([message]).then(function(index) {
var nextIndex = index;
@@ -224,10 +227,10 @@
// Select either the next or previous message
if (index > 0) {
nextIndex -= 1;
nextMessage = mailbox.$messages[nextIndex];
nextMessage = mailbox.getItemAtIndex(nextIndex);
}
if (index < mailbox.$messages.length)
previousMessage = mailbox.$messages[index];
if (index < mailbox.getLength())
previousMessage = mailbox.getItemAtIndex(index);
if (nextMessage) {
if (nextMessage.isread && previousMessage && !previousMessage.isread) {
@@ -242,7 +245,10 @@
try {
if (nextMessage && $mdMedia(sgConstant['gt-md'])) {
state.go('mail.account.mailbox.message', { messageId: nextMessage.uid });
if (Mailbox.$virtualMode)
state.go('mail.account.virtualMailbox.message', {mailboxId: encodeUriFilter(nextMessage.$mailbox.path), messageId: nextMessage.uid});
else
state.go('mail.account.mailbox.message', {messageId: nextMessage.uid});
if (nextIndex < mailbox.$topIndex)
mailbox.$topIndex = nextIndex;
else if (nextIndex > mailbox.$lastVisibleIndex)