Changeset 7228 for branches/2.4/expressoMail1_2/js/QuickCatalogSearch.js

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

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

branches/2.4/expressoMail1_2/js/QuickCatalogSearch.js

@@ -710 +710 @@
                 }
                 verifyEmails(email, divs);
-                final_contact = "\""+nome +"\" <"+email+">";
+                final_contact = "\""+nome +"\" <"+email+"> ";
 
                 final_contact = final_contact.replace(/\/n/, ""); 
                 var index = parseInt(divs.split("_")[1])-1;
-                if(data_[index].type_contact == "G"){
+        if(typeof(data_[index].isExternal) != 'undefined' &&  data_[index].isExternal == true)
+            draw_email_box(final_contact, content.find(field_).filter("textarea:first"));
+        else 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("textarea:first") 
+                                        , content.find(field_).filter("textarea:first")
                                 );
                         }else{
-                                draw_email_box(final_contact, content.find(field_).filter("textarea:first"))
+                                draw_email_box(final_contact, content.find(field_).filter("textarea:first"));
                         }
                 }else{
-                        draw_email_box((data_[index].id_contact ? data_[index].id_contact : data_[index].id), content.find(field_).filter("textarea:first"), (data_[index].id_contact ? true : "G")); 
+                        draw_email_box((data_[index].id_contact ? data_[index].id_contact : data_[index].id), content.find(field_).filter("textarea:first"), (data_[index].id_contact ? true : "G"));
                 }
-                content.find(field_).filter("textarea:first").val(""); 
+                content.find(field_).filter("textarea:first").val("");
                 button.onclick = function(){
                         remove_contact_field(document.getElementById(divs).innerHTML, button, divs);
@@ -800 +802 @@
                                                                         $( "#amount-text" ).focus();
                                                                         event.stopPropagation();
-                                                if(typeof(shortcut) != 'undefined') shortcut.disabled = false;  
-                                                                }, 
-                        open: function(event, ui)  
-                        { 
-                            if(typeof(shortcut) != 'undefined') shortcut.disabled = true;  
-                        } 
+                                    if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 
+                                                                },
+                        open: function(event, ui) 
+                        {
+                            if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 
+                        }
                         });
                 });
@@ -837 +839 @@
                                         content.find(field_).focus();    
                                 } 
-                        if(typeof(shortcut) != 'undefined') shortcut.disabled = false;  
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 
                         },
                         open: function () {
@@ -843 +845 @@
                                 $("#selectable li:first").focus();
                                 document.getElementById("amount-text").focus(); 
-                                if(typeof(shortcut) != 'undefined') shortcut.disabled = true;
+                if(typeof(shortcut) != 'undefined') shortcut.disabled = true; 
                         },
                         focus: function (event, ui) {