LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Different behaviour when deleting msg in xs

pull/210/head
Francis Lachapelle 2016-05-17 16:39:12 -04:00
parent 69c526eb67
commit 669eee301b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Templates/MailerUI/UIxMailViewTemplate.wox
View File

@ -54,7 +54,7 @@
<md-icon>create</md-icon>
</md-button>
<md-button class="sg-icon-button" label:aria-label="Delete"
ng-click="viewer.doDelete()">
ng-click="viewer.deleteMessage()">
<md-tooltip md-direction="bottom"><var:string label:value="Delete selected message or folder"/></md-tooltip>
<md-icon>delete</md-icon>
</md-button>

15
UI/WebServerResources/js/Mailer/MessageController.js
View File

@ -6,8 +6,8 @@
/**
* @ngInject
*/
MessageController.$inject = ['$window', '$scope', '$state', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'stateMessage', 'encodeUriFilter', 'sgSettings', 'sgFocus', 'Dialog', 'Calendar', 'Component', 'Account', 'Mailbox', 'Message'];
function MessageController($window, $scope, $state, $mdDialog, stateAccounts, stateAccount, stateMailbox, stateMessage, encodeUriFilter, sgSettings, focus, Dialog, Calendar, Component, Account, Mailbox, Message) {
MessageController.$inject = ['$window', '$scope', '$state', '$mdMedia', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'stateMessage', 'encodeUriFilter', 'sgSettings', 'sgFocus', 'Dialog', 'Calendar', 'Component', 'Account', 'Mailbox', 'Message'];
function MessageController($window, $scope, $state, $mdMedia, $mdDialog, stateAccounts, stateAccount, stateMailbox, stateMessage, encodeUriFilter, sgSettings, focus, Dialog, Calendar, Component, Account, Mailbox, Message) {
var vm = this, messageDialog = null, popupWindow = null;
// Expose controller
@ -24,7 +24,7 @@
vm.$showDetailedRecipients = false;
vm.toggleDetailedRecipients = toggleDetailedRecipients;
vm.filterMailtoLinks = filterMailtoLinks;
vm.doDelete = doDelete;
vm.deleteMessage = deleteMessage;
vm.close = close;
vm.reply = reply;
vm.replyAll = replyAll;
@ -152,7 +152,7 @@
}
}
function doDelete() {
function deleteMessage() {
var mailbox, message, state, nextMessage, previousMessage,
parentCtrls = $parentControllers();
@ -192,7 +192,7 @@
}
try {
if (nextMessage) {
if (nextMessage && !$mdMedia('xs')) {
state.go('mail.account.mailbox.message', { messageId: nextMessage.uid });
if (nextIndex < mailbox.$topIndex)
mailbox.$topIndex = nextIndex;
@ -200,7 +200,10 @@
mailbox.$topIndex = nextIndex - (mailbox.$lastVisibleIndex - mailbox.$topIndex);
}
else {
state.go('mail.account.mailbox');
state.go('mail.account.mailbox').then(function() {
message = null;
delete mailbox.selectedMessage;
});
}
}
catch (error) {}