(feat) reworked batch menu + added save messages option

pull/95/merge
Ludovic Marcotte 2015-08-05 14:39:58 -04:00
parent 124ca5d8cf
commit a220ee67b7
3 changed files with 35 additions and 10 deletions

View File

@ -313,7 +313,7 @@
data = [[request contentAsString] objectFromJSONString]; data = [[request contentAsString] objectFromJSONString];
withTrash = ![[data objectForKey: @"withoutTrash"] boolValue]; 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]; response = (WOResponse *) [co deleteUIDs: uids useTrashFolder: &withTrash inContext: context];
if (!response) if (!response)

View File

@ -438,19 +438,15 @@
</md-button> </md-button>
<label>{{mailbox.selectedFolder.$selectedCount()}} selected</label> <label>{{mailbox.selectedFolder.$selectedCount()}} selected</label>
<md-button class="sg-icon-button" ng-click="mailbox.selectAll()"> <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-icon>select_all</md-icon>
</md-button> </md-button>
<md-button class="sg-icon-button" ng-click="mailbox.confirmDeleteSelectedMessages()"> <md-button class="sg-icon-button" ng-click="mailbox.confirmDeleteSelectedMessages()">
<md-icon>delete</md-icon> <md-icon>delete</md-icon>
</md-button> </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-menu>
<md-button class="sg-icon-button" label:aria-label="Copy messages" ng-click="$mdOpenMenu()"> <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-icon>content_copy</md-icon>
</md-button> </md-button>
<md-menu-content width="4"> <md-menu-content width="4">
@ -470,6 +466,28 @@
</div> </div>
</md-menu-content> </md-menu-content>
</md-menu> </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> </div>
</md-toolbar> </md-toolbar>
<div layout="row" class="md-flex"> <div layout="row" class="md-flex">

View File

@ -21,6 +21,7 @@
vm.confirmDeleteSelectedMessages = confirmDeleteSelectedMessages; vm.confirmDeleteSelectedMessages = confirmDeleteSelectedMessages;
vm.copySelectedMessages = copySelectedMessages; vm.copySelectedMessages = copySelectedMessages;
// vm.moveSelectedMessages = moveSelectedMessages; // vm.moveSelectedMessages = moveSelectedMessages;
vm.saveSelectedMessages = saveSelectedMessages;
vm.selectAll = selectAll; vm.selectAll = selectAll;
vm.sort = sort; vm.sort = sort;
vm.sortedBy = sortedBy; vm.sortedBy = sortedBy;
@ -45,9 +46,9 @@
var selectedUIDs = _.pluck(selectedMessages, 'uid'); var selectedUIDs = _.pluck(selectedMessages, 'uid');
vm.selectedFolder.$deleteMessages(selectedUIDs).then(function() { vm.selectedFolder.$deleteMessages(selectedUIDs).then(function() {
vm.selectedFolder.$messages = _.difference(vm.selectedFolder.$messages, selectedMessages); 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() { vm.selectedFolder.$copyMessages(selectedUIDs, '/' + folder).then(function() {
// TODO: refresh target mailbox? // TODO: refresh target mailbox?
}, function(error) { }, 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() { function selectAll() {
_.each(vm.selectedFolder.$messages, function(message) { _.each(vm.selectedFolder.$messages, function(message) {
message.selected = true; message.selected = true;