Changeset 5306 for trunk/expressoMail1_2/js
- Timestamp:
- 01/04/12 14:55:54 (13 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/draw_api.js
r5302 r5306 211 211 } 212 212 213 var trash_span = document.getElementById(mount_url_folder(["lINBOX", "Trash"]) + 'tree_folders');214 var draft_span = document.getElementById(mount_url_folder(["lINBOX", "Drafts"]) + 'tree_folders');215 var sent_span = document.getElementById(mount_url_folder(["lINBOX", "Sent"]) + 'tree_folders');216 var spam_span = document.getElementById(mount_url_folder(["lINBOX", "Spam"]) + 'tree_folders');213 var trash_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Trash"]]) + 'tree_folders'); 214 var draft_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Drafts"]]) + 'tree_folders'); 215 var sent_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Sent"]]) + 'tree_folders'); 216 var spam_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Spam"]]) + 'tree_folders'); 217 217 //local folders 218 var sent_local_conf = this.preferences.save_in_folder.replace( "INBOX"+cyrus_delimiter,"local_");218 var sent_local_conf = this.preferences.save_in_folder.replace(mount_url_folder(["INBOX",""]),"local_"); 219 219 var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 220 220 var trash_local_span=document.getElementById('llocal_'+special_folders['Trash']+'tree_folders'); … … 249 249 250 250 draw_paging(Element('tot_m').innerHTML); 251 if(document.getElementById(mount_url_folder(["nINBOX", "Trash"])+"tree_folders"))251 if(document.getElementById(mount_url_folder(["nINBOX",special_folders["Trash"]])+"tree_folders")) 252 252 { 253 253 var trash = document.createElement("SPAN"); … … 260 260 trash.onmouseover = function() {trash.style.color="red";}; 261 261 trash.onmouseout= function() {trash.style.color="#666666";}; 262 document.getElementById(mount_url_folder(["nINBOX", "Trash"])+"tree_folders").appendChild(trash);263 } 264 if(document.getElementById(mount_url_folder(["nINBOX", "Spam"])+"tree_folders"))262 document.getElementById(mount_url_folder(["nINBOX",special_folders["Trash"]])+"tree_folders").appendChild(trash); 263 } 264 if(document.getElementById(mount_url_folder(["nINBOX",special_folders["Spam"]])+"tree_folders")) 265 265 { 266 266 var spam = document.createElement("SPAN"); … … 274 274 spam.onmouseover = function() {spam.style.color="red";}; 275 275 spam.onmouseout= function() {spam.style.color="#666666";}; 276 document.getElementById(mount_url_folder(["nINBOX", "Spam"])+"tree_folders").appendChild(spam);276 document.getElementById(mount_url_folder(["nINBOX",special_folders["Spam"]])+"tree_folders").appendChild(spam); 277 277 } 278 278 -
trunk/expressoMail1_2/js/main.js
r5302 r5306 9 9 10 10 function mount_url_folder(folders){ 11 12 if(folders.length == 1){ 13 14 var url = cyrus_delimiter+folders[0]; 15 return url; 16 17 } else { 18 19 var url = ""; 20 for(var i = 0; i < (folders.length -1); i++){ 21 url += folders[i]+cyrus_delimiter; 22 } 23 url += folders[folders.length - 1]; 24 return url; 25 } 11 return folders.join(cyrus_delimiter); 26 12 } 27 13 function init(){ … … 547 533 548 534 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){ 549 535 550 536 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 551 537 alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." ); … … 563 549 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash']; 564 550 } 565 else userTrashFolder = mount_url_folder(["INBOX", "Trash"]);551 else userTrashFolder = mount_url_folder(["INBOX",special_folders["Trash"]]); 566 552 567 553 if(openTab.type[currentTab] == 1) … … 632 618 write_msg(get_lang('No selected message.')); 633 619 } 634 635 620 636 621 … … 728 713 729 714 if (selected_messages){ 715 730 716 var selected_param = ""; 731 717 if (selected_messages.indexOf(',') != -1) … … 736 722 if(tr.getAttribute('name') == current_folder) 737 723 remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 738 if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))) 724 725 if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg))) 739 726 { 740 727 msg_to_delete += ','+special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); … … 755 742 if(tr.getAttribute('name') == current_folder) 756 743 remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 757 if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX", "Trash"])) || !(parseInt(preferences.save_deleted_msg))){744 if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg))){ 758 745 msg_to_delete = special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); 759 746 }else if (!(tr.getAttribute('name') == new_folder && action != 'delete')){ … … 771 758 params += "&new_folder_name_move="+url_encode(new_folder_name); 772 759 773 new_folder = mount_url_folder(["INBOX", "Trash"]);760 new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]); 774 761 new_folder_name = special_folders['Trash']; 775 762 params += "&selected_messages_delete="+url_encode(msg_to_delete); … … 777 764 cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params); 778 765 }else if(msg_to_delete != ""){ 779 new_folder = mount_url_folder(["INBOX", "Trash"]);766 new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]); 780 767 new_folder_name = special_folders['Trash']; 781 768 params += "&delete=true"; … … 1104 1091 { 1105 1092 var msgs_to_remove = {}; 1106 var target = mount_url_folder(["INBOX", "Trash"]) + cyrus_delimiter + 'tmpMoveToLocal';1093 var target = mount_url_folder(["INBOX",special_folders["Trash"],'tmpMoveToLocal']); 1107 1094 1108 1095 success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success ); … … 2978 2965 if(!verify_session(data)) 2979 2966 return; 2980 tree_folders.getNodeById(mount_url_folder(["INBOX", "Trash"])).alter({caption: get_lang("Trash")});2981 tree_folders.getNodeById(mount_url_folder(["INBOX", "Trash"]))._refresh();2967 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]])).alter({caption: get_lang("Trash")}); 2968 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]]))._refresh(); 2982 2969 update_quota(get_current_folder()); 2983 2970 if (data){ 2984 2971 write_msg(get_lang('Your Trash folder was empty.')); 2985 if (get_current_folder() == mount_url_folder(["INBOX", "Trash"])){2972 if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]])){ 2986 2973 draw_paging(0); 2987 2974 remove_rows(document.getElementById("table_box")); … … 3003 2990 if(!verify_session(data)) 3004 2991 return; 3005 if (get_current_folder() == mount_url_folder(["INBOX", "Spam"])){2992 if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Spam"]])){ 3006 2993 draw_paging(0); 3007 2994 remove_rows(document.getElementById("table_box")); 3008 2995 } 3009 tree_folders.getNodeById(mount_url_folder(["INBOX", "Spam"])).alter({caption: get_lang("Spam")});3010 tree_folders.getNodeById(mount_url_folder(["INBOX", "Spam"]))._refresh();2996 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]])).alter({caption: get_lang("Spam")}); 2997 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]]))._refresh(); 3011 2998 update_quota(get_current_folder()); 3012 2999 if (data) … … 3171 3158 else 3172 3159 { 3173 new_folder = mount_url_folder(["INBOX", "Spam"]);3160 new_folder = mount_url_folder(["INBOX",special_folders["Spam"]]); 3174 3161 } 3175 3162 var new_folder_name = 'Spam'; … … 3186 3173 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 3187 3174 else if(currentTab != 0 && currentTab.indexOf("search_") >= 0){ 3188 var content_search = document.getElementById('content_id_'+currentTab); 'INBOX/Trash', 'Trash',3189 move_search_msgs('content_id_'+currentTab, mount_url_folder(["INBOX", "Spam"]), special_folders['Spam']);3175 var content_search = document.getElementById('content_id_'+currentTab);mount_url_folder(["INBOX",special_folders['Trash']]), 'Trash', 3176 move_search_msgs('content_id_'+currentTab, mount_url_folder(["INBOX",special_folders["Spam"]]), special_folders['Spam']); 3190 3177 refresh(); 3191 3178 return;
Note: See TracChangeset
for help on using the changeset viewer.