Fix handling of comma when adding contact from contacts widget (#1489107)

pull/88/head
Aleksander Machniak 12 years ago
parent 1a9d466ef3
commit 40d1f99cb2

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix handling of comma when adding contact from contacts widget (#1489107)
- Fix bug where a message was opened in both preview pane and new window on double-click (#1489122)
- Fix fatal error when xdebug.max_nesting_level was exceeded in rcube_washtml (#1489110)
- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)

@ -3129,7 +3129,7 @@ function rcube_webmail()
this.compose_add_recipient = function(field)
{
var recipients = [], input = $('#_'+field);
var recipients = [], input = $('#_'+field), delim = this.env.recipients_delimiter;
if (this.contact_list && this.contact_list.selection.length) {
for (var id, n=0; n < this.contact_list.selection.length; n++) {
@ -3148,8 +3148,10 @@ function rcube_webmail()
}
if (recipients.length && input.length) {
var oldval = input.val();
input.val((oldval ? oldval + this.env.recipients_delimiter : '') + recipients.join(this.env.recipients_delimiter));
var oldval = input.val(), rx = new RegExp(RegExp.escape(delim) + '\\s*$');
if (oldval && !rx.test(oldval))
oldval += delim + ' ';
input.val(oldval + recipients.join(delim + ' ') + delim + ' ');
this.triggerEvent('add-recipient', { field:field, recipients:recipients });
}
};

Loading…
Cancel
Save