From ee25ea4c5d8aef60cb24e7dc0280aca85eafcad2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 6 Jul 2017 08:54:52 +0200
Subject: [PATCH] Get rid of recipients_(separator|delimiter) use, support both
 (;,)

---
 skins/elastic/ui.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 1ad163df4..750876c18 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1316,7 +1316,7 @@ function rcube_elastic_ui()
                 email = ' <' + email + '>';
             }
 
-            email_element.text((name ? email : '') + rcmail.env.recipients_separator);
+            email_element.text((name ? email : '') + ',');
             recipient.attr({'class': 'recipient', contenteditable: false, title: name ? (name + email) : null})
                 .append([name_element, email_element, link]);
 
@@ -1418,8 +1418,8 @@ function rcube_elastic_ui()
                     return false;
                 }
             }
-            // Here we add a recipient box when the separator character was pressed
-            else if (e.keyCode == 188) {
+            // Here we add a recipient box when the separator character (,;) was pressed
+            else if (e.keyCode == 188 || e.keyCode == 59) {
                 if (update_func()) {
                     focus_func();
                     return false;
@@ -1476,7 +1476,6 @@ function rcube_elastic_ui()
     function recipient_input_parser(text)
     {
         var recipients = [],
-            delim = rcmail.env.recipients_delimiter + ';',
             address_rx_part = '(\\S+|("[^"]+"))@\\S+',
             recipient_rx1 = new RegExp('(<' + address_rx_part + '>)'),
             recipient_rx2 = new RegExp('(' + address_rx_part + ')'),
@@ -1552,7 +1551,7 @@ function rcube_elastic_ui()
     };
 
     /**
-     * Adds some logic to the contact photo widget
+     * Adds logic to the contact photo widget
      */
     function image_upload_input(obj)
     {