moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-12-23 15:58:49 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/WO-84'

Browse Source
This commit is contained in:
Tankred Hase 2013-11-11 16:16:28 +01:00
commit c397210c24
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/js/controller/mail-list.js
View File

@ -103,7 +103,31 @@ define(function(require) {
return;
}
var index;
var index, trashFolder;
trashFolder = _.findWhere($scope.folders, {
type: 'Trash'
});
if (getFolder() === trashFolder) {
$scope.state.dialog = {
open: true,
title: 'Remove permanently?',
message: 'Do you want to remove this message permanently?',
callback: function(ok) {
$scope.state.dialog.open = false;
if (!ok) {
return;
}
removeLocalAndShowNext();
removeRemote();
}
};
return;
}
removeLocalAndShowNext();
removeRemote();
@ -123,9 +147,6 @@ define(function(require) {
}
function removeRemote() {
var trashFolder = _.findWhere($scope.folders, {
type: 'Trash'
});
if (getFolder() === trashFolder) {
emailDao.imapDeleteMessage({
folder: getFolder().path,