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 @@
+
select_all
delete
-
- star
-
-
- markunread
-
+
content_copy
@@ -470,6 +466,28 @@
+
+
+ more_vert
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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;