|
|
|
@ -2892,7 +2892,7 @@ function rcube_elastic_ui()
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function recipient_input(obj)
|
|
|
|
function recipient_input(obj)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var list, input, ac_props,
|
|
|
|
var list, input, ac_props, update_lock,
|
|
|
|
input_len_update = function() {
|
|
|
|
input_len_update = function() {
|
|
|
|
input.css('width', input.val().length * 10 + 15);
|
|
|
|
input.css('width', input.val().length * 10 + 15);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -2932,29 +2932,41 @@ function rcube_elastic_ui()
|
|
|
|
else
|
|
|
|
else
|
|
|
|
recipient.insertBefore(input.parent());
|
|
|
|
recipient.insertBefore(input.parent());
|
|
|
|
},
|
|
|
|
},
|
|
|
|
update_func = function() {
|
|
|
|
update_func = function(text) {
|
|
|
|
var text = input.val().replace(/[,;\s]+$/, ''),
|
|
|
|
var result;
|
|
|
|
result = recipient_input_parser(text);
|
|
|
|
|
|
|
|
|
|
|
|
if (update_lock) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
update_lock = true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
text = (text || input.val()).replace(/[,;\s]+$/, '');
|
|
|
|
|
|
|
|
result = recipient_input_parser(text);
|
|
|
|
|
|
|
|
|
|
|
|
$.each(result.recipients, function() {
|
|
|
|
$.each(result.recipients, function() {
|
|
|
|
insert_recipient(this.name, this.email);
|
|
|
|
insert_recipient(this.name, this.email);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
input.val(result.text);
|
|
|
|
// setTimeout() here is needed for proper input reset on paste event
|
|
|
|
apply_func();
|
|
|
|
// This is also the reason why we need parse_lock
|
|
|
|
input_len_update();
|
|
|
|
setTimeout(function() {
|
|
|
|
|
|
|
|
input.val(result.text);
|
|
|
|
|
|
|
|
apply_func();
|
|
|
|
|
|
|
|
input_len_update();
|
|
|
|
|
|
|
|
update_lock = false;
|
|
|
|
|
|
|
|
}, 1);
|
|
|
|
|
|
|
|
|
|
|
|
if (result.recipients.length) {
|
|
|
|
return result.recipients.length > 0;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
parse_func = function(e) {
|
|
|
|
parse_func = function(e) {
|
|
|
|
// Note it can be also executed when autocomplete inserts a recipient
|
|
|
|
|
|
|
|
update_func();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (e.type == 'blur') {
|
|
|
|
if (e.type == 'blur') {
|
|
|
|
list.removeClass('focus');
|
|
|
|
list.removeClass('focus');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// On paste the text is not yet in the input we have to use clipboard.
|
|
|
|
|
|
|
|
// Also because on paste new-line characters are replaced by spaces (#6460)
|
|
|
|
|
|
|
|
update_func(e.type == 'paste' ? (e.originalEvent.clipboardData || window.clipboardData).getData('text') : null);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
keydown_func = function(e) {
|
|
|
|
keydown_func = function(e) {
|
|
|
|
// On Backspace remove the last recipient
|
|
|
|
// On Backspace remove the last recipient
|
|
|
|
@ -2963,8 +2975,8 @@ function rcube_elastic_ui()
|
|
|
|
apply_func();
|
|
|
|
apply_func();
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Here we add a recipient box when the separator character (,;) was pressed
|
|
|
|
// Here we add a recipient box when the separator (,;) or Enter was pressed
|
|
|
|
else if (e.key == ',' || e.key == ';') {
|
|
|
|
else if (e.key == ',' || e.key == ';' || e.key == 'Enter') {
|
|
|
|
if (update_func()) {
|
|
|
|
if (update_func()) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2973,7 +2985,7 @@ function rcube_elastic_ui()
|
|
|
|
input_len_update();
|
|
|
|
input_len_update();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
// Create the input elemennt and "editable" area
|
|
|
|
// Create the input element and "editable" area
|
|
|
|
input = $('<input>').attr({type: 'text', tabindex: $(obj).attr('tabindex')})
|
|
|
|
input = $('<input>').attr({type: 'text', tabindex: $(obj).attr('tabindex')})
|
|
|
|
.on('paste change blur', parse_func)
|
|
|
|
.on('paste change blur', parse_func)
|
|
|
|
.on('keydown', keydown_func)
|
|
|
|
.on('keydown', keydown_func)
|
|
|
|
@ -3021,6 +3033,9 @@ function rcube_elastic_ui()
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function recipient_input_parser(text)
|
|
|
|
function recipient_input_parser(text)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// support new-line as a separator, for paste action (#6460)
|
|
|
|
|
|
|
|
text = $.trim(text.replace(/[,;\s]*[\r\n]+/g, ','));
|
|
|
|
|
|
|
|
|
|
|
|
var recipients = [],
|
|
|
|
var recipients = [],
|
|
|
|
address_rx_part = '(\\S+|("[^"]+"))@\\S+',
|
|
|
|
address_rx_part = '(\\S+|("[^"]+"))@\\S+',
|
|
|
|
recipient_rx1 = new RegExp('(<' + address_rx_part + '>)'),
|
|
|
|
recipient_rx1 = new RegExp('(<' + address_rx_part + '>)'),
|
|
|
|
|
Aleksander Machniak
6 years ago