Changeset 7603 for trunk/expressoMail1_2/js/messages_controller.js
- Timestamp:
- 12/04/12 10:44:14 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/messages_controller.js
r7496 r7603 64 64 } 65 65 } 66 67 66 68 67 69 messages_proxy.prototype.get_msg = function(msg_number,msg_folder,set_flag,call_back) { … … 73 75 url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg', 74 76 msg_number: msg_number, 75 msg_folder: msg_folder 77 msg_folder: msg_folder, 78 folder : folder, 79 sort_box_type : sort_box_type, 80 search_box_type : search_box_type, 81 sort_box_reverse: sort_box_reverse 76 82 } ), 77 83 success: function( data ){ … … 93 99 } 94 100 95 messages_proxy.prototype.delete_msgs = function(folder, msgs_number, border_ID ) {101 messages_proxy.prototype.delete_msgs = function(folder, msgs_number, border_ID, id_delete_msg) { 96 102 97 103 if (folder == 'null') … … 114 120 115 121 if (!this.is_local_folder(folder)){ 116 delete_msgs(folder, msgs_number, border_ID );122 delete_msgs(folder, msgs_number, border_ID, undefined, undefined, id_delete_msg); 117 123 }else { 118 124 //MAILARCHIVER-03 … … 121 127 if (isNaN(currentTab) && parseInt(preferences.delete_and_show_previous_message) && msg_to_delete) { 122 128 if (msg_to_delete.previousSibling){ 123 var previous_msg = msg_to_delete.previousSibling.id;124 129 var previous_msg = id_delete_msg ? id_delete_msg : msg_to_delete.previousSibling.id; 130 125 131 //user has preference to maintain default folder structure at local folders, so we have trash folder 126 132 if(preferences.auto_create_local == 1){ … … 136 142 expresso_mail_archive.deleteMessages(msgs_number); 137 143 delete_border(currentTab,'false'); 138 expresso_mail_archive.getMessage(previous_msg) 144 expresso_mail_archive.getMessage(previous_msg); 139 145 } 140 146 }
Note: See TracChangeset
for help on using the changeset viewer.