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

fix(mail): Fix errors while spamming arrow keys on mail list. The transition was not finished

Browse Source
This commit is contained in:
smizrahi
2024-03-19 16:08:54 +01:00
parent e6ff9a408d
commit 049a569d7f
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MailboxController.js
+41 -6
View File
@@ -34,6 +34,8 @@
this.messageDialog = null; // also access from Message controller
this.mode = { search: false, multiple: 0 };
this.allSelected = false;
this.isLoadingMessage = false;
this.nextAction = null;
if (!Mailbox.$virtualMode)
this.selectedFolder.getLabels(); // fetch labels from server
@@ -289,6 +291,10 @@
* User has pressed up arrow key
*/
function _nextMessage($event) {
if (vm.isLoadingMessage) {
vm.nextAction = { m: _nextMessage, p: $event };
}
var index = vm.selectedFolder.$selectedMessageIndex();
if (angular.isDefined(index)) {
@@ -302,7 +308,7 @@
vm.selectedFolder.$topIndex = vm.selectedFolder.getLength();
}
if (index > -1)
if (index > -1 && !vm.isLoadingMessage)
vm.selectMessage(vm.selectedFolder.getItemAtIndex(index));
$event.preventDefault();
@@ -314,6 +320,10 @@
* User has pressed the down arrow key
*/
function _previousMessage($event) {
if (vm.isLoadingMessage) {
vm.nextAction = { m: _previousMessage, p: $event };
}
var index = vm.selectedFolder.$selectedMessageIndex();
if (angular.isDefined(index)) {
@@ -325,7 +335,7 @@
// No message is selected, show newest
index = 0;
if (index < vm.selectedFolder.getLength())
if (index < vm.selectedFolder.getLength() && !vm.isLoadingMessage)
vm.selectMessage(vm.selectedFolder.getItemAtIndex(index));
else
index = -1;
@@ -370,10 +380,35 @@
}
this.selectMessage = function(message) {
if (Mailbox.$virtualMode)
$state.go('mail.account.virtualMailbox.message', {mailboxId: encodeUriFilter(encodeUriFilter(message.$mailbox.path)), messageId: message.uid});
else
$state.go('mail.account.mailbox.message', {mailboxId: encodeUriFilter(encodeUriFilter(message.$mailbox.path)), messageId: message.uid});
if (Mailbox.$virtualMode) {
vm.isLoadingMessage = true;
$state.go('mail.account.virtualMailbox.message', { mailboxId: encodeUriFilter(encodeUriFilter(message.$mailbox.path)), messageId: message.uid }).then(function () {
}).catch((err) => {
console.error(err);
})
.finally(() => {
vm.isLoadingMessage = false;
if (vm.nextAction) {
vm.nextAction.m(vm.nextAction.p);
vm.nextAction = null;
}
});
} else {
vm.isLoadingMessage = true;
$state.go('mail.account.mailbox.message', { mailboxId: encodeUriFilter(encodeUriFilter(message.$mailbox.path)), messageId: message.uid }).then(function () {
}).catch((err) => {
console.error(err);
})
.finally(() => {
vm.isLoadingMessage = false;
if (vm.nextAction) {
vm.nextAction.m(vm.nextAction.p);
vm.nextAction = null;
}
});
}
};
this.toggleMessageSelection = function($event, message) {