Changeset 7045

Timestamp:

08/17/12 10:41:59 (12 years ago)

Author:

angelo

Message:

Ticket #3042 - Inconsistencia ao inserir contato pessoal sem nome

File:

• trunk/expressoMail1_2/js/draw_api.js (modified) (2 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -4158 +4158 @@
                                                 });
                                         }).find(".box-input").val("\""+data.collection.data[0].value+"\" <"+data.collection.data[1].value+">");
-                                        box.find(".email-box-value").html( (data.collection.data[0].value.length > 18 ? data.collection.data[0].value.substring(0, 15)+"...": data.collection.data[0].value))
+                                        var emailBoxValue = data.collection.data[0].value.length > 18 ? data.collection.data[0].value.substring(0, 15)+"...": data.collection.data[0].value;
+                                        emailBoxValue = emailBoxValue.length > 2 ? emailBoxValue : data.collection.data[1].value.substr(0,data.collection.data[1].value.indexOf('@'));
+                                        emailBoxValue = emailBoxValue > 18 ? emailBoxValue.substr(0,15) + "..." : emailBoxValue;
+                                        box.find(".email-box-value").html(emailBoxValue);
                                 }
                         }else{
@@ -4183 +4186 @@
                                         });
                                 }).find(".box-input").val("\""+data.collection.itens[0].data[0].value+"\" <"+data.collection.itens[0].data[1].value+">");
-                                box.find(".email-box-value").html( (data.collection.itens[0].data[0].value.length > 18 ? data.collection.itens[0].data[0].value.substring(0, 15)+"...": data.collection.itens[0].data[0].value))
+                                var emailBoxValue = data.collection.itens[0].data[0].value.length > 18 ? data.collection.itens[0].data[0].value.substring(0, 15)+"...": data.collection.itens[0].data[0].value;
+                                emailBoxValue = emailBoxValue.length > 2 ? emailBoxValue : data.collection.itens[0].data[1].value.substr(0,data.collection.itens[0].data[1].indexOf('@'));
+                                emailBoxValue = emailBoxValue > 18 ? emailBoxValue.substr(0,15) + "..." : emailBoxValue;
+                                box.find(".email-box-value").html(emailBoxValue);
                                 if(data.collection.itens[0].data[3].value == "TRUE"){
                                         box.removeClass("invalid-email-box").addClass("out-office-box");