From 96e93c0eebdf118fc719effa0ef4752ceb296bb1 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 10 Dec 2015 13:54:24 -0500 Subject: [PATCH] (feat) show toast when compacting folder --- UI/MailerUI/UIxMailFolderActions.m | 4 ++-- .../js/Mailer/MailboxesController.js | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 9ed02d74a..07abdcd98 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -627,8 +627,8 @@ error = [co expunge]; if (error) { - response = [self responseWithStatus: 500]; - [response appendContentString: @"Unable to expunge folder."]; + response = [self responseWithStatus: 500 + andJSONRepresentation: [NSDictionary dictionaryWithObject: @"Unable to expunge folder." forKey: @"message"]]; } else { diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js index 99fba781c..c9d725cc0 100644 --- a/UI/WebServerResources/js/Mailer/MailboxesController.js +++ b/UI/WebServerResources/js/Mailer/MailboxesController.js @@ -6,8 +6,8 @@ /** * @ngInject */ - MailboxesController.$inject = ['$state', '$timeout', '$mdDialog', '$mdMedia', '$mdSidenav', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts']; - function MailboxesController($state, $timeout, $mdDialog, $mdMedia, $mdSidenav, focus, encodeUriFilter, Dialog, Settings, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) { + MailboxesController.$inject = ['$state', '$timeout', '$mdDialog', '$mdToast', '$mdMedia', '$mdSidenav', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts']; + function MailboxesController($state, $timeout, $mdDialog, $mdToast, $mdMedia, $mdSidenav, focus, encodeUriFilter, Dialog, Settings, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) { var vm = this, account, mailbox; @@ -238,9 +238,11 @@ function compactFolder(folder) { folder.$compact().then(function() { - // Success - }, function(error) { - Dialog.alert(l('Warning'), error); + $mdToast.show( + $mdToast.simple() + .content(l('Folder compacted')) + .position('top right') + .hideDelay(3000)); }); }