Changeset 1226

Timestamp:

07/30/09 11:24:30 (15 years ago)

Author:

amuller

Message:

Ticket #563 - Homologação do branch Expresso 2.0

File:

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

trunk/expressoMail1_2/js/main.js

@@ -483 +483 @@
                 }
                 
-                var msg_to_delete;
-                for (var i=0; i<data.msgs_number.length; i++){
-                        msg_to_delete = Element(data.msgs_number[i]);
-                        if (msg_to_delete){
-                                mail_msg.removeChild(msg_to_delete);
-                        }
-                }
-                
                 if (show_success_msg) {
                         if (data.msgs_number.length == 1)
@@ -497 +489 @@
                                 write_msg(get_lang("The messages were deleted."));
                 }
-
                 if (openTab.type[currentTab] > 1){
                         if (parseInt(preferences.delete_and_show_previous_message))
                         {
-                                delete_border(currentTab,'false');
-                                show_msg(data.previous_msg);
+                                msg_to_delete = Element(msgs_number);
+                                if (msg_to_delete)
+                                {
+                                        if (msg_to_delete.previousSibling){
+                                                var previous_msg = msg_to_delete.previousSibling.id;
+                                                cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg);
+                                        }
                         }
                         else
                                 delete_border(currentTab,'false');
-                }
+                        }
+                }
+                for (var i=0; i<data.msgs_number.length; i++){
+                        msg_to_delete = Element(data.msgs_number[i]);
+                        if (msg_to_delete){
+                                removeAll(msg_to_delete.id);
+                        }
+                }
                 Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - data.msgs_number.length;
                 refresh();      
@@ -514 +517 @@
                 msgs_number = get_selected_messages();
         if (msgs_number.length > 0 || parseInt(msgs_number) > 0)
-                cExecute ("$this.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_delete_msgs);
+                cExecute ("$this.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_delete_msgs);
         else
                 write_msg(get_lang('No selected message.'));