diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 593d9e7548..2a11c1c604 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -41,6 +41,9 @@ "Move To" = "Move To"; "Copy To" = "Copy To"; "Add to" = "Add to"; +"To" = "To"; +"Carbon Copy (Cc)" = "Carbon Copy (Cc)"; +"Blind Carbon Copy (Bcc)" = "Blind Carbon Copy (Bcc)"; /* Subheader of empty addressbook */ "No contact" = "No contact"; @@ -258,4 +261,4 @@ "key_create_card" = "c"; /* Hotkey to create a new list */ -"key_create_list" = "l"; \ No newline at end of file +"key_create_list" = "l"; diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index a76d4de96c..6b0bad5435 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -364,10 +364,29 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js index dfa53e26ef..c012589c1b 100644 --- a/UI/WebServerResources/js/Contacts/AddressBookController.js +++ b/UI/WebServerResources/js/Contacts/AddressBookController.js @@ -319,7 +319,7 @@ vm.selectedFolder.$filter(''); } - function newMessage($event, recipients) { + function newMessage($event, recipients, recipientsField) { Account.$findAll().then(function(accounts) { var account = _.find(accounts, function(o) { if (o.id === 0) @@ -330,7 +330,7 @@ // list before proceeding with message's creation account.$getMailboxes().then(function(mailboxes) { account.$newMessage().then(function(message) { - angular.extend(message.editable, { to: recipients }); + message.editable[recipientsField] = recipients; $mdDialog.show({ parent: angular.element(document.body), targetEvent: $event, @@ -351,12 +351,12 @@ function newMessageWithRecipient($event, recipient, fn) { var recipients = [fn + ' <' + recipient + '>']; - vm.newMessage($event, recipients); + vm.newMessage($event, recipients, 'to'); $event.stopPropagation(); $event.preventDefault(); } - function newMessageWithSelectedCards($event) { + function newMessageWithSelectedCards($event, recipientsField) { var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; }); var promises = [], recipients = []; @@ -386,7 +386,7 @@ $q.all(promises).then(function() { recipients = _.uniq(recipients); if (recipients.length) - vm.newMessage($event, recipients); + vm.newMessage($event, recipients, recipientsField); }); } }