Changeset 5391

Timestamp:

01/18/12 09:06:22 (12 years ago)

Author:

gustavo

Message:

Ticket #2434 - Corrigido problema ao tentar criar evento a partir de um rascunho

File:

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

trunk/expressoMail1_2/js/draw_api.js

@@ -2615 +2615 @@
                                 : $.now() + (User.preferences.defaultDuration * 60000)
                 }, true, path);
+                
+                //TimePicker Não está funcionando corretamente, o motivo ainda é desconhecido.
+                /*
                 $(".new-event-win").find('input.time').timepicker({ 
                         closeText: 'Ok',
@@ -2630 +2633 @@
                         }
                 });
+                */
+                
                 var emails = $("#to_values_"+ID).val();
                 emails = emails.split(",");
@@ -2681 +2686 @@
                                 var user = DataLayer.get('user', ["=", "mail", decoded], true);
                                 if(!(!!user)){
-                                        var newAttendeeEmail = decoded;
+                                        if(decoded.match(/^[\w!#$%&'*+\/=?^`{|}~-]+(\.[\w!#$%&'*+\/=?^`{|}~-]+)*@(([\w-]+\.)+[A-Za-z]{2,6}|\[\d{1,3}(\.\d{1,3}){3}\])$/))
+                                                var newAttendeeEmail = decoded;
+                                        else{
+                                                var newAttendeeEmail = "";
+                                                newAttendeeName = decoded;
+                                        }
                                 }
                         }
@@ -2719 +2729 @@
                                         hide: false,
                                         content: {
-                                                text: $('<div></div>').html( DataLayer.render( path+'templates/attendee_quick_edit.ejs', {attendee:{name:(newAttendeeName ? newAttendeeName : user[0].name), mail:(newAttendeeEmail ? newAttendeeEmail : user[0].mail)}} ) ), 
+                                                text: $('<div></div>').html( DataLayer.render( path+'templates/attendee_quick_edit.ejs', {attendee:{name:( (!!user ? (!!user[0] ? (!!user[0].name ? !!user[0].name : newAttendeeName): newAttendeeName) : newAttendeeName)), mail:(!!user ? (!!user[0] ? (!!user[0].mail ? !!user[0].mail : newAttendeeEmail): newAttendeeEmail) : newAttendeeEmail)}} ) ), 
                                                 title: {
                                                         text:'Detalhes do participante',