Changeset 1659

Timestamp:

11/17/09 14:07:25 (14 years ago)

Author:

niltonneto

Message:

Ticket #757 - Corrigido problema ao deletar mensagem, sem enviar para Lixeira.

File:

• branches/2.0/expressoMail1_2/js/main.js (modified) (6 diffs)

branches/2.0/expressoMail1_2/js/main.js

@@ -13 +13 @@
         }
         var save_preferences = function(data){
+                
                 preferences = data;
                 if(preferences.hide_folders == "1")
                         Element('divAppboxHeader').innerHTML =  title_app_menu;
-
+                
                 if (preferences.delete_trash_messages_after_n_days != 0)
                         cExecute ("$this.imap_functions.automatic_trash_cleanness&before_date="+preferences.delete_trash_messages_after_n_days+"&cyrus_delimiter="+cyrus_delimiter, handler_automatic_trash_cleanness);
-
+                
                 if(preferences.outoffice == "1")
                         write_msg(get_lang("Attention, you are in out of office mode."), true);
@@ -459 +460 @@
         
         var handler_delete_msgs = function(data){
+                
                 Element('chk_box_select_all_messages').checked = false;
                 if (currentTab)
@@ -464 +466 @@
                 else
                         mail_msg = Element("tbody_box");
-                
+        
                 if ( preferences.use_shortcuts == '1') {
-                        var all_messages = mail_msg.childNodes;
-
-                        //Last msg is selected
-                        if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') ) {
-                                select_msg('null', 'up', true);
-                        }
-                        else {
-                                if (!select_msg('null', 'down', true)) {
+                                //Last msg is selected
+                                if (mail_msg && exist_className(mail_msg.childNodes[mail_msg.childNodes.length-1], 'selected_shortcut_msg') ) {
                                         select_msg('null', 'up', true);
                                 }
-                        }
-                }
+                                else {
+                                        if (!select_msg('null', 'down', true)) {
+                                                select_msg('null', 'up', true);
+                                        }
+                                }
+                        }
                 
                 if (show_success_msg) {
@@ -486 +486 @@
                 }
                 if (openTab.type[currentTab] > 1){
-                        if (parseInt(preferences.delete_and_show_previous_message))
-                        {
-                                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);
-                                        }
+                        var msg_to_delete = Element(msgs_number);
+                        if (parseInt(preferences.delete_and_show_previous_message) && 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');
                         }
                         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);
-                        }
+                }
+        for (var i=0; i<data.msgs_number.length; i++){
+                var 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();      
@@ -654 +652 @@
                         if(msg_to_delete)
                                 mail_msg.removeChild(msg_to_delete);
-                                                
+
                         return;
                 }
@@ -1565 +1563 @@
         else
                 form = document.forms["form_message_"+ID];
-        
+
         form.appendChild(textArea);
         form.appendChild(input_folder);