From 669eee301b84a81bcd1c11897ebe404cb5dd5001 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 17 May 2016 16:39:12 -0400
Subject: [PATCH] (js) Different behaviour when deleting msg in xs

---
 UI/Templates/MailerUI/UIxMailViewTemplate.wox     |  2 +-
 .../js/Mailer/MessageController.js                | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index b459f45ec..0c6c7ef8c 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -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>
diff --git a/UI/WebServerResources/js/Mailer/MessageController.js b/UI/WebServerResources/js/Mailer/MessageController.js
index 877853400..132ad4ba6 100644
--- a/UI/WebServerResources/js/Mailer/MessageController.js
+++ b/UI/WebServerResources/js/Mailer/MessageController.js
@@ -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) {}