Changeset 8121
- Timestamp:
- 04/26/13 15:01:51 (10 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/draw_api.js
r8119 r8121 2054 2054 } 2055 2055 } 2056 }else if(headers_msgs.from !== undefined ){2056 }else if(headers_msgs.from !== undefined && headers_msgs.from !== null){ 2057 2057 spanSender.innerHTML = headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email; 2058 2058 } … … 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>, '; 3004 3004 //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> | '; 3005 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> | ';3005 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> | '; 3006 3006 //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> | '; 3007 3007 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){ 5883 5883 if(expresso_mail_archive.enabled){ 5884 console.log(2);5885 5884 if(proxy_mensagens.is_local_folder(current_folder))//Unarchive link 5886 5885 span_options.innerHTML += ' <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="verifyContext(\'unarchive\')">'+get_lang("Unarchive")+'</span>'; -
trunk/expressoMail1_2/js/mail_archiver.js
r8118 r8121 1460 1460 if(folderId == 'local_root') 1461 1461 folderId = ""; 1462 var exp_verifyId = RegExp("^messages\_[0-9|a-z]+\-[0-9|a-z|\-]+$"); 1463 if(exp_verifyId.test(folderId)) 1464 folderId = folderId.replace("messages_", ""); 1462 1465 ArchiveServices.getFolderInfo(expresso_mail_archive.getFolderInfoOperationOK, expresso_mail_archive.getFolderInfoOperationFailure, expresso_mail_archive.session.id, folderId); 1463 1466 } … … 1526 1529 MailArchiver.prototype.listMessages = function(folderId){ 1527 1530 try{ 1531 / 1528 1532 connector.showProgressBar(); 1529 1533 var getcurrent = get_current_folder(); … … 1535 1539 folderid = this.currentfolder; 1536 1540 } 1537 1538 1541 var objfolder = new Object(); 1539 objfolder.folder = folderid; 1542 var exp_verifyId = RegExp("^messages\_[0-9|a-z]+\-[0-9|a-z|\-]+$"); 1543 if(exp_verifyId.test(folderid)) 1544 folderid = folderid.replace("messages_", ""); 1545 objfolder.folder = folderid; 1540 1546 //var testing_data_xml = '<?xml version="1.0" encoding="UTF-8"?><query lowerIndex="0" upperIndex="50"><folder id="'+folderid+'"/><order asc="date"/><order desc="subject"/></query>'; 1541 1547 //var testing_data_json_mapped = '{"query":{"@lowerIndex":"0", "@upperIndex":"50", "folder":[{"@id":"'+folderid+'"}], "order":[{"@asc":"date", "@desc":"subject"}]}}';
Note: See TracChangeset
for help on using the changeset viewer.