Changeset 6528 for trunk/expressoMail1_2/js/QuickCatalogSearch.js

Timestamp:

06/15/12 17:00:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Merge do branch das novas funcionalidaes para o trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/QuickCatalogSearch.js (modified) (4 diffs)

trunk/expressoMail1_2/js/QuickCatalogSearch.js

@@ -290 +290 @@
                         var signal = "+";
                         var btnClass = "add";
-                        var emailList = content.find(field_).val();
-                        var emails_adicionados = emailList.split(",");
+                        emails_adicionados = "";
+                        var emailList = content.find(field_).filter("input").parent().find("div input");
+                        //      var array = content.find(".to-tr").find(".box");
+                        $.each(emailList, function(index, value){
+                                emails_adicionados += $(value).val() + ",";
+                        });
+                        emails_adicionados = emails_adicionados.split(",");
                         for(aux=0; aux<emails_adicionados.length -1; aux++) {
                                 if(emails_adicionados[aux].match(/<([^<]*)>[\s]*$/)){
@@ -697 +702 @@
                 var nome = $(contact).clone().find('.name').text();
                 var email = $(contact).clone().find('.email').text();
-                
                 if(email == get_lang("No mail")){
                         alert(get_lang("It is not possible to add this contact as a recipient because it does not have email"));
@@ -704 +708 @@
                         return;
                 }
-                
                 verifyEmails(email, divs);
-                
-                final_contact = "\""+nome +"\" <"+email+">, ";
-                
-                var emailList      = content.find(field_).val();
-                //remove os caracteres da busca
-                emailList = emailList.substr(0,emailList.lastIndexOf(',')+1); 
-                
-        if (emailList[0] != '"' && emailList.indexOf(",") < 0)
-                        emailList = emailList.substr(end_);
-        if(emailList.lastIndexOf(",") > 0){
-                if(emailList.substr(emailList.length-1, emailList.length) == "," || emailList.substr(emailList.length-2, 1) == ","){
-                        emailList = emailList.substr(0, emailList.lastIndexOf(",") + 1);
-                } else {
-                        emailList = emailList.substr(0, emailList.lastIndexOf("") + 1);         
-                        final_contact = ","+final_contact;
+                final_contact = "\""+nome +"\" <"+email+">";
+
+                final_contact = final_contact.replace(/\/n/, ""); 
+                var index = parseInt(divs.split("_")[1])-1;
+                if(data_[index].type_contact == "G"){
+                        var ldap_id = preferences.expressoMail_ldap_identifier_recipient;
+                        if(ldap_id){
+                                draw_email_box(
+                                        (data_[index][ldap_id.toLowerCase()] ? data_[index][ldap_id.toLowerCase()][0] : final_contact)
+                                        , content.find(field_).filter("input")
+                                );
+                        }else{
+                                draw_email_box(final_contact, content.find(field_).filter("input"));
+                        }
+                }else{
+                        draw_email_box((data_[index].id_contact ? data_[index].id_contact : data_[index].id), content.find(field_).filter("input"), (data_[index].id_contact ? true : "G"));
                 }
-        }
-
-                final_contact = final_contact.replace(/\/n/, "");
-                new_emailList = emailList + final_contact;    
-        content.find(field_).val(new_emailList);
-                
-                content.find(field_).trigger("update");
-                
                 button.onclick = function(){
                         remove_contact_field(document.getElementById(divs).innerHTML, button, divs);
                 };
                 var div = document.getElementById(divs);
-                
                 div.ondblclick = function(){
                         remove_contact_field(div.innerHTML, button, divs);
                 };
-                
                 button.innerHTML = '<span class="ui-button-text" style="">x</span>';
     }
@@ -748 +742 @@
         function remove_contact_field(contact, button, divs) {
                 var email = $(contact).clone().find('.email').text();
-                var exist = false;
-                
-                var emailList = content.find(field_).val();
-                var emails_adicionados = emailList.split(",");
-                
-                verifyEmails(email, divs);
-                
-                for(i=0; i<emails_adicionados.length -1; i++) {
-
-                        if(emails_adicionados[i].match(/<([^<]*)>[\s]*$/)){
-                                if(emails_adicionados[i].match(/<([^<]*)>[\s]*$/)[1].toLowerCase() == email.toLowerCase()) {
-                                        emails_adicionados[i] = "%";
-                                        exist = true;
-                                }
-                        }else{
-                                if(emails_adicionados[i].toLowerCase() == email.toLowerCase()) {
-                                        emails_adicionados[i] = "%";
-                                        exist = true;
-                                }
-                        }
-                }
-                
-                if (exist == false) 
-                        return false;
-                var novos_contatos = emails_adicionados.join(",");  
-                novos_contatos = novos_contatos.replace(/%,/g, "");
-                content.find(field_).val(novos_contatos);
-                
+                var array = content.find(field_).parent().find("div input");
+                $.each(array, function(index, value){
+                        var validated_email = $(value).val();
+                        if(validated_email.match(/<([^<]*)>[\s]*$/)){
+                                if(validated_email.match(/<([^<]*)>[\s]*$/)[1].toLowerCase() == email.toLowerCase()) {
+                                        $(value).parent().remove();
+                                }
+                        }
+                });
+        
                 button.onclick = function(){
                         add_contact_field(document.getElementById(divs).innerHTML, button, divs);
                 };
-                
                 var div = document.getElementById(divs);
-                
                 div.ondblclick = function(){
                         add_contact_field(div.innerHTML, button, divs);
                 };
-                
-                content.find(field_).trigger("update");
                 button.innerHTML = '<span class="ui-button-text" style="">+</span>';
         }