(fix) delete messages from Drafts folder that aren't meant to be sent

pull/188/head
Ludovic Marcotte 2016-01-25 14:21:38 -05:00
parent b265de91fd
commit 5ad4d317df
3 changed files with 6 additions and 1 deletions

View File

@ -269,12 +269,14 @@
return Account.$$resource.fetch(this.id.toString(), 'compose').then(function(data) {
Account.$log.debug('New message (compose): ' + JSON.stringify(data, undefined, 2));
var message = new Account.$Message(data.accountId, _this.$getMailboxByPath(data.mailboxPath), data);
message.isNew = true;
return message;
}).then(function(message) {
// Fetch draft initial data
return Account.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Account.$log.debug('New message (edit): ' + JSON.stringify(data, undefined, 2));
angular.extend(message.editable, data);
message.isNew = true;
return message;
});
});

View File

@ -566,6 +566,7 @@
Message.$log.debug('save = ' + JSON.stringify(response, undefined, 2));
_this.$setUID(response.uid);
_this.$reload({asDraft: false}); // fetch a new viewable version of the message
_this.isNew = false;
});
};

View File

@ -133,10 +133,12 @@
}
function cancel() {
// TODO: delete draft?
if (vm.autosave)
$timeout.cancel(vm.autosave);
if (vm.message.isNew && vm.message.attachmentAttrs)
vm.message.$mailbox.$deleteMessages([vm.message]);
$mdDialog.cancel();
}