From a220ee67b786d2ebb7d3bff8559b031b258df67c Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 5 Aug 2015 14:39:58 -0400
Subject: [PATCH] (feat) reworked batch menu + added save messages option

---
 UI/MailerUI/UIxMailFolderActions.m            |  2 +-
 UI/Templates/MailerUI/UIxMailMainFrame.wox    | 30 +++++++++++++++----
 .../js/Mailer/MailboxController.js            | 13 ++++++--
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index afe838314..bc36cb91a 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -313,7 +313,7 @@
   data = [[request contentAsString] objectFromJSONString];
   withTrash = ![[data objectForKey: @"withoutTrash"] boolValue];
 
-  if ((uids = [data objectForKey: @"uids"]) && [uids isKindOfClass: [NSArray class]] && [uids length] > 0)
+  if ((uids = [data objectForKey: @"uids"]) && [uids isKindOfClass: [NSArray class]] && [uids count] > 0)
     {
       response = (WOResponse *) [co deleteUIDs: uids useTrashFolder: &withTrash inContext: context];
       if (!response)
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 3661043f7..fa54640ea 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -438,19 +438,15 @@
         </md-button>
         <label>{{mailbox.selectedFolder.$selectedCount()}} selected</label>
         <md-button class="sg-icon-button" ng-click="mailbox.selectAll()">
+          <md-tooltip md-direction="left"><var:string label:value="Select All"/></md-tooltip>
           <md-icon>select_all</md-icon>
         </md-button>
         <md-button class="sg-icon-button" ng-click="mailbox.confirmDeleteSelectedMessages()">
           <md-icon>delete</md-icon>
         </md-button>
-        <md-button class="sg-icon-button">
-          <md-icon>star</md-icon>
-        </md-button>
-        <md-button class="sg-icon-button">
-          <md-icon>markunread</md-icon>
-        </md-button>
         <md-menu>
           <md-button class="sg-icon-button" label:aria-label="Copy messages" ng-click="$mdOpenMenu()">
+            <md-tooltip md-direction="left"><var:string label:value="Copy To"/></md-tooltip>
             <md-icon>content_copy</md-icon>
           </md-button>
           <md-menu-content width="4">
@@ -470,6 +466,28 @@
             </div>
           </md-menu-content>
         </md-menu>
+        <md-menu>
+          <md-button class="sg-icon-button" label:aria-label="More messages options" ng-click="$mdOpenMenu()">
+            <md-icon>more_vert</md-icon>
+          </md-button>
+          <md-menu-content width="2">
+            <md-menu-item>
+              <md-button>
+                <var:string label:value="Flag"/>
+              </md-button>
+            </md-menu-item>
+            <md-menu-item>
+              <md-button>
+                <var:string label:value="Mark as Unread"/>
+              </md-button>
+            </md-menu-item>
+            <md-menu-item>
+              <md-button ng-click="mailbox.saveSelectedMessages()">
+                <var:string label:value="Save As..."/>
+              </md-button>
+            </md-menu-item>
+          </md-menu-content>
+        </md-menu>
       </div>
     </md-toolbar>
     <div layout="row" class="md-flex">
diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index 39625ffae..734d46b52 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -21,6 +21,7 @@
     vm.confirmDeleteSelectedMessages = confirmDeleteSelectedMessages;
     vm.copySelectedMessages = copySelectedMessages;
     // vm.moveSelectedMessages = moveSelectedMessages;
+    vm.saveSelectedMessages = saveSelectedMessages;
     vm.selectAll = selectAll;
     vm.sort = sort;
     vm.sortedBy = sortedBy;
@@ -45,9 +46,9 @@
           var selectedUIDs = _.pluck(selectedMessages, 'uid');
           vm.selectedFolder.$deleteMessages(selectedUIDs).then(function() {
             vm.selectedFolder.$messages = _.difference(vm.selectedFolder.$messages, selectedMessages);
+          },  function(error) {
+            Dialog.alert(l('Error'), error);
           });
-        },  function(data, status) {
-          // Delete failed
         });
     }
 
@@ -57,7 +58,7 @@
       vm.selectedFolder.$copyMessages(selectedUIDs, '/' + folder).then(function() {
         // TODO: refresh target mailbox?
       }, function(error) {
-        Dialog.alert(l('Error'), error.error);
+        Dialog.alert(l('Error'), error);
       });
     }
 
@@ -70,6 +71,12 @@
     //   });
     // }
 
+    function saveSelectedMessages() {
+      var selectedMessages = _.filter(vm.selectedFolder.$messages, function(message) { return message.selected; });
+      var selectedUIDs = _.pluck(selectedMessages, 'uid');
+      window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/saveMessages?uid=' + selectedUIDs.join(",");
+    }
+
     function selectAll() {
       _.each(vm.selectedFolder.$messages, function(message) {
         message.selected = true;