amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-05 13:28:51 +00:00
Code Issues Projects Releases Wiki Activity

(js) Decompose contacts list in mail editor

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-22 16:58:40 -05:00
parent 711e159b4b
commit 6464e35704
3 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UI/Templates/MailerUI/UIxMailEditor.wox
View File

@@ -54,7 +54,8 @@
<var:string label:value="To"/>
</label>
<md-chips ng-model="editor.message.editable.to"
md-transform-chip="editor.addRecipient($chip)">
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'to')">
<md-autocomplete
class="sg-chips-autocomplete"
md-autofocus="true"
@@ -86,7 +87,8 @@
<var:string label:value="Cc"/>
</label>
<md-chips ng-model="editor.message.editable.cc"
md-transform-chip="editor.addRecipient($chip)">
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'cc')">
<md-autocomplete
class="sg-chips-autocomplete"
md-search-text="editor.autocomplete.cc.searchText"
@@ -117,7 +119,8 @@
<var:string label:value="Bcc"/>
</label>
<md-chips ng-model="editor.message.editable.bcc"
md-transform-chip="editor.addRecipient($chip)">
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'bcc')">
<md-autocomplete
class="sg-chips-autocomplete"
md-selected-item="editor.autocomplete.bcc.selected"

8
UI/WebServerResources/js/Contacts/Card.service.js
View File

@@ -271,11 +271,11 @@
* @returns the fullname along with a matching email address in parentheses
*/
Card.prototype.$shortFormat = function(partial) {
var fullname = this.$fullname(),
var fullname = [this.$$fullname],
email = this.$preferredEmail(partial);
if (email && email != fullname)
fullname += ' <' + email + '>';
return fullname;
if (email && email != this.$$fullname)
fullname.push(' <' + email + '>');
return fullname.join(' ');
};
/**

54
UI/WebServerResources/js/Mailer/MessageEditorController.js
View File

@@ -6,9 +6,9 @@
/**
* @ngInject
*/
MessageEditorController.$inject = ['$stateParams', '$mdDialog', '$mdToast', 'FileUploader', 'stateAccounts', 'stateMessage', 'stateRecipients', '$timeout', 'Dialog', 'AddressBook', 'Preferences'];
function MessageEditorController($stateParams, $mdDialog, $mdToast, FileUploader, stateAccounts, stateMessage, stateRecipients, $timeout, Dialog, AddressBook, Preferences) {
var vm = this;
MessageEditorController.$inject = ['$stateParams', '$mdConstant', '$mdDialog', '$mdToast', 'FileUploader', 'stateAccounts', 'stateMessage', 'stateRecipients', '$timeout', 'Dialog', 'AddressBook', 'Card', 'Preferences'];
function MessageEditorController($stateParams, $mdConstant, $mdDialog, $mdToast, FileUploader, stateAccounts, stateMessage, stateRecipients, $timeout, Dialog, AddressBook, Card, Preferences) {
var vm = this, semicolon = 186;
vm.addRecipient = addRecipient;
vm.autocomplete = {to: {}, cc: {}, bcc: {}};
@@ -22,6 +22,7 @@
vm.removeAttachment = removeAttachment;
vm.contactFilter = contactFilter;
vm.identities = _.pluck(_.flatten(_.pluck(stateAccounts, 'identities')), 'full');
vm.recipientSeparatorKeys = [$mdConstant.KEY_CODE.ENTER, $mdConstant.KEY_CODE.COMMA, semicolon];
vm.uploader = new FileUploader({
url: stateMessage.$absolutePath({asDraft: true}) + '/save',
autoUpload: true,
@@ -137,20 +138,44 @@
}
function contactFilter($query) {
return AddressBook.$filterAll($query);
AddressBook.$filterAll($query);
return AddressBook.$cards;
}
function addRecipient(user) {
var recipient = [];
function addRecipient(contact, field) {
var recipients, recipient, list;
if (angular.isString(user))
return user;
if (user.$$fullname)
recipient.push(user.$$fullname);
if (user.$$email)
recipient.push('<' + user.$$email + '>');
if (angular.isString(contact))
return contact;
return recipient.join(' ');
recipients = vm.message.editable[field];
if (contact.c_component == 'vlist') {
// If the list's members were already fetch, use them
if (angular.isDefined(contact.refs) && contact.refs.length) {
_.each(contact.refs, function(ref) {
if (ref.email.length)
recipients.push(ref.$shortFormat());
});
}
else {
list = Card.$find(contact.container, contact.c_name);
list.$id().then(function(listId) {
_.forEach(list.refs, function(ref) {
if (ref.email.length)
recipients.push(ref.$shortFormat());
});
});
}
}
else {
recipient = contact.$shortFormat();
}
if (recipient)
return recipient;
else
return null;
}
// Drafts autosaving
@@ -180,5 +205,6 @@
angular
.module('SOGo.MailerUI')
.controller('SendMessageToastController', SendMessageToastController)
.controller('MessageEditorController', MessageEditorController);
.controller('MessageEditorController', MessageEditorController);
})();