Changeset 8121 for trunk/expressoMail1_2/js/draw_api.js

Timestamp:

04/26/13 15:01:51 (11 years ago)

Author:

marcieli

Message:

Ticket #3437 - Correcao na manipulacao de mensagens de subpastas locais, tratamento do id da subpasta.

File:

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

trunk/expressoMail1_2/js/draw_api.js

@@ -2054 +2054 @@
                                                 }
                                         }
-                                }else if(headers_msgs.from !== undefined){
+                                }else if(headers_msgs.from !== undefined && headers_msgs.from !== null){
                                 spanSender.innerHTML =  headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email;
                                 }
@@ -3003 +3003 @@
                 //var option_mark_as_important                  = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
                 //var option_mark_as_normal                             = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
-                var block_user = '<span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick ="block_user_email(\''+info_msg.from.email+'\');">'+get_lang("Block Sender")+'</span> | ';    
+                var block_user = '<span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick ="block_user_email(\''+(info_msg.from ? info_msg.from.email : "" )+'\');">'+get_lang("Block Sender")+'</span> | ';    
                 //var option_forward = '<span onclick="new_message(\'forward\',\''+ ID+'\');" onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options">'+get_lang("Forward")+'</span> | ';
                 var option_move = '<span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | ';
@@ -5882 +5882 @@
     if(preferences.use_local_messages==1){
         if(expresso_mail_archive.enabled){
-            console.log(2);
            if(proxy_mensagens.is_local_folder(current_folder))//Unarchive link
              span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="verifyContext(\'unarchive\')">'+get_lang("Unarchive")+'</span>';