Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
(js) Mark multiple messages as seen
Fixes #3873
  • Loading branch information
cgx committed Nov 7, 2016
1 parent 836e2ee commit 4a6e539
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 4 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -6,6 +6,7 @@ New features

Enhancements
- [eas] now also search on senders when using EAS Search ops
- [web] allow multiple messages to be marked as seen (#3873)

Bug fixes
- [core] fixed condition in weekly recurrence calculator
Expand Down
1 change: 1 addition & 0 deletions UI/MailerUI/English.lproj/Localizable.strings
Expand Up @@ -354,6 +354,7 @@
"Copy messages" = "Copy messages";
"More messages options" = "More messages options";
"Mark as Unread" = "Mark as Unread";
"Mark as Read" = "Mark as Read";
"Closing Window ..." = "Closing Window ...";
"Tried to send too many mails. Please wait." = "Tried to send too many mails. Please wait.";
"View Mail" = "View Mail";
Expand Down
5 changes: 5 additions & 0 deletions UI/Templates/MailerUI/UIxMailFolderTemplate.wox
Expand Up @@ -186,6 +186,11 @@
<var:string label:value="Mark as Unread"/>
</md-button>
</md-menu-item>
<md-menu-item>
<md-button ng-click="mailbox.markSelectedMessagesAsRead()">
<var:string label:value="Mark as Read"/>
</md-button>
</md-menu-item>
<md-menu-item>
<md-button ng-click="mailbox.selectedFolder.saveSelectedMessages()">
<var:string label:value="Save As..."/>
Expand Down
4 changes: 2 additions & 2 deletions UI/WebServerResources/js/Common/sgHotkeys.service.js
Expand Up @@ -123,12 +123,12 @@
/**
* Keybindings are ignored by default when coming from a form input field.
*/
this._preventIn = ['INPUT', 'SELECT', 'TEXTAREA'];
this._preventIn = ['INPUT', 'SELECT', 'TEXTAREA', 'MD-OPTION'];

/**
* Keybindings are ignored by default when coming from special elements
*/
this._preventInClass = ['md-focused', 'md-chip-content'];
this._preventInClass = ['md-chip-content'];

this._onKeydown = this._onKeydown.bind(this);
this._onKeyup = this._onKeyup.bind(this);
Expand Down
20 changes: 18 additions & 2 deletions UI/WebServerResources/js/Mailer/MailboxController.js
Expand Up @@ -33,6 +33,7 @@
vm.moveSelectedMessages = moveSelectedMessages;
vm.markSelectedMessagesAsFlagged = markSelectedMessagesAsFlagged;
vm.markSelectedMessagesAsUnread = markSelectedMessagesAsUnread;
vm.markSelectedMessagesAsRead = markSelectedMessagesAsRead;
vm.selectAll = selectAll;
vm.unselectMessages = unselectMessages;

Expand Down Expand Up @@ -448,13 +449,28 @@

function markSelectedMessagesAsUnread() {
var selectedMessages = vm.selectedFolder.$selectedMessages();
if (_.size(selectedMessages) > 0)
if (_.size(selectedMessages) > 0) {
vm.selectedFolder.$flagMessages(selectedMessages, 'seen', 'remove').then(function(messages) {
_.forEach(messages, function(message) {
if (message.isread)
message.$mailbox.unseenCount++;
message.isread = false;
message.$mailbox.unseenCount++;
});
});
}
}

function markSelectedMessagesAsRead() {
var selectedMessages = vm.selectedFolder.$selectedMessages();
if (_.size(selectedMessages) > 0) {
vm.selectedFolder.$flagMessages(selectedMessages, 'seen', 'add').then(function(messages) {
_.forEach(messages, function(message) {
if (!message.isread)
message.$mailbox.unseenCount--;
message.isread = true;
});
});
}
}

}
Expand Down

0 comments on commit 4a6e539

Please sign in to comment.