Changeset 5211
- Timestamp:
- 11/29/11 09:45:21 (12 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/draw_api.js
r5200 r5211 209 209 } 210 210 211 var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+ trashfolder+ 'tree_folders');212 var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+draftsfolder+ 'tree_folders');213 var sent_span = document.getElementById('lINBOX'+cyrus_delimiter+sentfolder+ 'tree_folders');214 var spam_span = document.getElementById('lINBOX'+cyrus_delimiter+spamfolder+ 'tree_folders');211 var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Trash'] + 'tree_folders'); 212 var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Drafts'] + 'tree_folders'); 213 var sent_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Sent'] + 'tree_folders'); 214 var spam_span = document.getElementById('lINBOX'+cyrus_delimiter+special_folders['Spam'] + 'tree_folders'); 215 215 //local folders 216 216 var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_"); 217 217 var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 218 var trash_local_span=document.getElementById('llocal_'+ trashfolder+'tree_folders');219 var draft_local_span=document.getElementById('llocal_'+ draftsfolder+'tree_folders');220 var sent_span_default=document.getElementById('llocal_'+s entfolder+'tree_folders');218 var trash_local_span=document.getElementById('llocal_'+special_folders['Trash']+'tree_folders'); 219 var draft_local_span=document.getElementById('llocal_'+special_folders['Drafts']+'tree_folders'); 220 var sent_span_default=document.getElementById('llocal_'+special_folders['Sent']+'tree_folders'); 221 221 222 222 … … 247 247 248 248 draw_paging(Element('tot_m').innerHTML); 249 if(document.getElementById("nINBOX"+cyrus_delimiter+ trashfolder+"tree_folders"))249 if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders")) 250 250 { 251 251 var trash = document.createElement("SPAN"); … … 258 258 trash.onmouseover = function() {trash.style.color="red";}; 259 259 trash.onmouseout= function() {trash.style.color="#666666";}; 260 document.getElementById("nINBOX"+cyrus_delimiter+ trashfolder+"tree_folders").appendChild(trash);261 } 262 if(document.getElementById("nINBOX"+cyrus_delimiter+sp amfolder+"tree_folders"))260 document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Trash']+"tree_folders").appendChild(trash); 261 } 262 if(document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders")) 263 263 { 264 264 var spam = document.createElement("SPAN"); … … 272 272 spam.onmouseover = function() {spam.style.color="red";}; 273 273 spam.onmouseout= function() {spam.style.color="#666666";}; 274 document.getElementById("nINBOX"+cyrus_delimiter+sp amfolder+"tree_folders").appendChild(spam);274 document.getElementById("nINBOX"+cyrus_delimiter+special_folders['Spam']+"tree_folders").appendChild(spam); 275 275 } 276 276 … … 1363 1363 1364 1364 test = true; 1365 if(msg_folder.indexOf(s entfolder) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX"+cyrus_delimiter).indexOf(preferences.save_in_folder) !=-1)1365 if(msg_folder.indexOf(special_folders['Sent']) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX"+cyrus_delimiter).indexOf(preferences.save_in_folder) !=-1) 1366 1366 test = false; 1367 1367 -
trunk/expressoMail1_2/js/main.js
r5200 r5211 539 539 { 540 540 var arrayFolder = folder.split(cyrus_delimiter); 541 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+ trashfolder;541 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash']; 542 542 } 543 else userTrashFolder = 'INBOX'+cyrus_delimiter+ trashfolder;543 else userTrashFolder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 544 544 545 545 if(openTab.type[currentTab] == 1) 546 return move_search_msgs('content_id_'+currentTab,userTrashFolder, trashfolder);546 return move_search_msgs('content_id_'+currentTab,userTrashFolder,special_folders['Trash']); 547 547 548 548 if(currentTab.toString().indexOf("_r") != -1) … … 550 550 551 551 if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 552 move_msgs2(folder, msgs_number, border_ID, userTrashFolder, trashfolder,show_success_msg );552 move_msgs2(folder, msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 553 553 return; 554 554 } … … 749 749 params += "&new_folder_name_move="+url_encode(new_folder_name); 750 750 751 new_folder = 'INBOX'+cyrus_delimiter+ trashfolder;752 new_folder_name = trashfolder;751 new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 752 new_folder_name = special_folders['Trash']; 753 753 params += "&selected_messages_delete="+url_encode(msg_to_delete); 754 754 params += "&new_folder_delete="+url_encode(new_folder); 755 755 cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params); 756 756 }else if(msg_to_delete != ""){ 757 new_folder = 'INBOX'+cyrus_delimiter+ trashfolder;758 new_folder_name = trashfolder;757 new_folder = 'INBOX'+cyrus_delimiter+special_folders['Trash']; 758 new_folder_name = special_folders['Trash']; 759 759 params += "&delete=true"; 760 760 params += "&selected_messages="+url_encode(msg_to_delete); … … 775 775 function move_msgs2(folder, msgs_number, border_ID, new_folder, new_folder_name,show_success_msg, not_opem_previus){ 776 776 not_opem_previus = typeof(not_opem_previus) != 'undefined' ? not_opem_previus : false; 777 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 777 var folder_error = new_folder_name; 778 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 778 779 alert( "Impossivel mover mensagens que estão ainda estão sendo arquivadas." ); 779 780 return; … … 789 790 if (data.match(/^(.*)TRYCREATE(.*)$/)){ 790 791 connector.loadScript('TreeS'); 791 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : trashfolder;792 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', move_to_folder));792 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : special_folders['Trash']; 793 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', folder_error)); 793 794 connector.loadScript('TreeShow'); 794 795 ttree.FOLDER = 'root'; … … 1081 1082 { 1082 1083 var msgs_to_remove = {}; 1083 var target = 'INBOX' + cyrus_delimiter + trashfolder+ cyrus_delimiter + 'tmpMoveToLocal';1084 var target = 'INBOX' + cyrus_delimiter + special_folders['Trash'] + cyrus_delimiter + 'tmpMoveToLocal'; 1084 1085 1085 1086 success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success ); … … 1269 1270 show_msg_img(border_ID.match(/^\d*/)[0], Element('input_folder_'+border_ID).value); 1270 1271 } 1271 var new_border_ID = draw_new_message(parseInt(border_ID)); 1272 if(typeof(openTab.type[new_border_ID]) != "undefined") { 1272 var new_border_ID = draw_new_message(parseInt(border_ID.replace('_r',''))); 1273 1274 if(typeof(openTab.type[new_border_ID]) != "undefined") { 1273 1275 if(tabTypes[type] == openTab.type[new_border_ID]) { 1274 1276 if (type != 'edit') … … 2821 2823 if(!verify_session(data)) 2822 2824 return; 2823 tree_folders.getNodeById('INBOX'+cyrus_delimiter+ trashfolder).alter({caption: get_lang("Trash")});2824 tree_folders.getNodeById('INBOX'+cyrus_delimiter+ trashfolder)._refresh();2825 tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash']).alter({caption: get_lang("Trash")}); 2826 tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Trash'])._refresh(); 2825 2827 update_quota(get_current_folder()); 2826 2828 if (data){ 2827 2829 write_msg(get_lang('Your Trash folder was empty.')); 2828 if (get_current_folder() == 'INBOX'+cyrus_delimiter+ trashfolder){2830 if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Trash']){ 2829 2831 draw_paging(0); 2830 2832 remove_rows(document.getElementById("table_box")); … … 2846 2848 if(!verify_session(data)) 2847 2849 return; 2848 if (get_current_folder() == 'INBOX'+cyrus_delimiter+sp amfolder){2850 if (get_current_folder() == 'INBOX'+cyrus_delimiter+special_folders['Spam']){ 2849 2851 draw_paging(0); 2850 2852 remove_rows(document.getElementById("table_box")); 2851 2853 } 2852 tree_folders.getNodeById('INBOX'+cyrus_delimiter+sp amfolder).alter({caption: get_lang("Spam")});2853 tree_folders.getNodeById('INBOX'+cyrus_delimiter+sp amfolder)._refresh();2854 tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam']).alter({caption: get_lang("Spam")}); 2855 tree_folders.getNodeById('INBOX'+cyrus_delimiter+special_folders['Spam'])._refresh(); 2854 2856 update_quota(get_current_folder()); 2855 2857 if (data) … … 3010 3012 { 3011 3013 arrayFolder = folder.split(cyrus_delimiter); 3012 new_folder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+sp amfolder;3014 new_folder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Spam']; 3013 3015 } 3014 3016 else 3015 3017 { 3016 new_folder = 'INBOX' + cyrus_delimiter + sp amfolder;3018 new_folder = 'INBOX' + cyrus_delimiter + special_folders['Spam']; 3017 3019 } 3018 3020 var new_folder_name = 'Spam'; … … 3029 3031 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 3030 3032 else if(currentTab != 0 && currentTab.indexOf("search_") >= 0){ 3031 var content_search = document.getElementById('content_id_'+currentTab); 3033 var content_search = document.getElementById('content_id_'+currentTab);'INBOX/Trash', 'Trash', 3032 3034 move_search_msgs('content_id_'+currentTab, 'INBOX'+cyrus_delimiter+special_folders['Spam'], special_folders['Spam']); 3033 3035 refresh(); … … 3216 3218 write_msg(data.append); 3217 3219 } 3218 cExecute('$this.imap_functions.ope_msg_part&msg_folder='+data+'&save_folder=INBOX'+cyrus_delimiter+ trashfolder, handler_open_msg_part);3220 cExecute('$this.imap_functions.ope_msg_part&msg_folder='+data+'&save_folder=INBOX'+cyrus_delimiter+special_folders['Trash'] , handler_open_msg_part); 3219 3221 } 3220 3222 function hack_sent_queue(data,rowid_message) {
Note: See TracChangeset
for help on using the changeset viewer.