amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-17 19:38:00 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix selected message class in advanced search

Browse Source 
Also improved display of accounts subheaders.
This commit is contained in:
Francis Lachapelle
2015-09-24 21:42:33 -04:00
parent ec8c2d08e2
commit 31f2e4b549
6 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/Mailer.app.js
+7 -8
View File
@@ -191,17 +191,14 @@
return mailbox;
};
if (Mailbox.$virtualMode)
return Mailbox.selectedFolder;
return _find(stateAccount.$mailboxes);
}
/**
* @ngInject
*/
stateMessages.$inject = ['$q', 'Mailbox', 'stateMailbox'];
function stateMessages($q, Mailbox, stateMailbox) {
stateMessages.$inject = ['Mailbox', 'stateMailbox'];
function stateMessages(Mailbox, stateMailbox) {
if (Mailbox.$virtualMode)
return [];
@@ -236,10 +233,12 @@
function stateVirtualMailboxOfMessage($q, Mailbox, decodeUriFilter, $stateParams) {
var mailboxId = decodeUriFilter($stateParams.mailboxId);
if (Mailbox.$virtualMode)
if (Mailbox.$virtualMode) {
Mailbox.selectedFolder.resetSelectedMessage();
return _.find(Mailbox.selectedFolder.$mailboxes, function(mailboxObject) {
return mailboxObject.path == mailboxId;
});
}
else
return $q.reject("No virtual mailbox defined for message");
}
@@ -247,8 +246,8 @@
/**
* @ngInject
*/
stateMessage.$inject = ['Mailbox', 'encodeUriFilter', '$stateParams', '$state', 'stateMailbox'];
function stateMessage(Mailbox, encodeUriFilter, $stateParams, $state, stateMailbox) {
stateMessage.$inject = ['Mailbox', 'encodeUriFilter', '$stateParams', '$state', 'stateMailbox', 'stateMessages'];
function stateMessage(Mailbox, encodeUriFilter, $stateParams, $state, stateMailbox, stateMessages) {
var message;
message = _.find(stateMailbox.$messages, function(messageObject) {