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

(js) Fix contact's nickname when composing msg

Browse Source 
The nickname is wrapped with <em> tags when viewing the card but those
tags must not appear when composing a new message from one of the
contact's email addresses.
This commit is contained in:
Francis Lachapelle
2016-05-25 11:33:25 -04:00
parent c9346e4f24
commit 9fc22f2689
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Contacts/Card.service.js
+3 -3
View File
@@ -216,14 +216,14 @@
return Card.$$resource.download(this.pid, 'export', {uids: selectedIDs}, {type: 'application/octet-stream'});
};
Card.prototype.$fullname = function() {
var fn = this.c_cn || '', names;
Card.prototype.$fullname = function(options) {
var fn = this.c_cn || '', html = options && options.html, names;
if (fn.length === 0) {
names = [];
if (this.c_givenname && this.c_givenname.length > 0)
names.push(this.c_givenname);
if (this.nickname && this.nickname.length > 0)
names.push('<em>' + this.nickname + '</em>');
names.push((html?'<em>':'') + this.nickname + (html?'</em>':''));
if (this.c_sn && this.c_sn.length > 0)
names.push(this.c_sn);
if (names.length > 0)