(js) Different behaviour when deleting msg in xs
parent
69c526eb67
commit
669eee301b
|
@ -54,7 +54,7 @@
|
||||||
<md-icon>create</md-icon>
|
<md-icon>create</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
<md-button class="sg-icon-button" label:aria-label="Delete"
|
<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-tooltip md-direction="bottom"><var:string label:value="Delete selected message or folder"/></md-tooltip>
|
||||||
<md-icon>delete</md-icon>
|
<md-icon>delete</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
/**
|
/**
|
||||||
* @ngInject
|
* @ngInject
|
||||||
*/
|
*/
|
||||||
MessageController.$inject = ['$window', '$scope', '$state', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'stateMessage', 'encodeUriFilter', 'sgSettings', 'sgFocus', '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, $mdDialog, stateAccounts, stateAccount, stateMailbox, stateMessage, encodeUriFilter, sgSettings, focus, 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;
|
var vm = this, messageDialog = null, popupWindow = null;
|
||||||
|
|
||||||
// Expose controller
|
// Expose controller
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
vm.$showDetailedRecipients = false;
|
vm.$showDetailedRecipients = false;
|
||||||
vm.toggleDetailedRecipients = toggleDetailedRecipients;
|
vm.toggleDetailedRecipients = toggleDetailedRecipients;
|
||||||
vm.filterMailtoLinks = filterMailtoLinks;
|
vm.filterMailtoLinks = filterMailtoLinks;
|
||||||
vm.doDelete = doDelete;
|
vm.deleteMessage = deleteMessage;
|
||||||
vm.close = close;
|
vm.close = close;
|
||||||
vm.reply = reply;
|
vm.reply = reply;
|
||||||
vm.replyAll = replyAll;
|
vm.replyAll = replyAll;
|
||||||
|
@ -152,7 +152,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function doDelete() {
|
function deleteMessage() {
|
||||||
var mailbox, message, state, nextMessage, previousMessage,
|
var mailbox, message, state, nextMessage, previousMessage,
|
||||||
parentCtrls = $parentControllers();
|
parentCtrls = $parentControllers();
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (nextMessage) {
|
if (nextMessage && !$mdMedia('xs')) {
|
||||||
state.go('mail.account.mailbox.message', { messageId: nextMessage.uid });
|
state.go('mail.account.mailbox.message', { messageId: nextMessage.uid });
|
||||||
if (nextIndex < mailbox.$topIndex)
|
if (nextIndex < mailbox.$topIndex)
|
||||||
mailbox.$topIndex = nextIndex;
|
mailbox.$topIndex = nextIndex;
|
||||||
|
@ -200,7 +200,10 @@
|
||||||
mailbox.$topIndex = nextIndex - (mailbox.$lastVisibleIndex - mailbox.$topIndex);
|
mailbox.$topIndex = nextIndex - (mailbox.$lastVisibleIndex - mailbox.$topIndex);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
state.go('mail.account.mailbox');
|
state.go('mail.account.mailbox').then(function() {
|
||||||
|
message = null;
|
||||||
|
delete mailbox.selectedMessage;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (error) {}
|
catch (error) {}
|
||||||
|
|
Loading…
Reference in New Issue