Changeset 5134 for trunk/expressoMail1_2/js/messages_controller.js

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/js/messages_controller.js (modified) (6 diffs)

trunk/expressoMail1_2/js/messages_controller.js

@@ -13 +13 @@
                         var real_folder = folder.substr(6);             
                         var msgs = expresso_local_messages.get_local_range_msgs(real_folder,msg_range_begin,preferences.max_email_per_page,sort_box_type,sort_box_reverse,search_box_type,preferences.preview_msg_subject,preferences.preview_msg_tip);
-                        eval('call_back(msgs)');
+                        if(call_back) 
+                                call_back(msgs);
+                        else{
+                                call_back = function(data)
+                                {
+                                        alternate_border(0); 
+                                        draw_box(data, get_current_folder());
+                                } 
+                                call_back(msgs);
+                        }
                         draw_tree_local_folders();
                 }else {
@@ -38 +47 @@
                 if (msgs_number == 'selected')
                         msgs_number = get_selected_messages();
-                        
-                if (!this.is_local_folder(folder)) 
+                if (!this.is_local_folder(folder)){
                         delete_msgs(folder, msgs_number, border_ID);
-                else {
+                }else {
+                        if((folder != 'local_Trash') && (expresso_local_messages.as_trash())){
+                                expresso_local_messages.move_messages('Trash', msgs_number);
+                                this.aux_interface_remove_mails(msgs_number, 'local_Trash', border_ID);
+                                draw_tree_local_folders();
+                                refresh(); 
+                        }else{
                         expresso_local_messages.delete_msgs(msgs_number, border_ID);
                         draw_tree_local_folders();
-                         update_local_box();
+                                refresh();
+                        }
                 }
         }
@@ -236 +251 @@
                 else 
                         if ((!this.is_local_folder(folder)) && (!this.is_local_folder(new_folder))) { //Move entre pastas locais...
+                                if(new_folder_name == 'Spam'){
+                                        move_msgs_not_previus(folder, msgs_number, border_ID, new_folder, new_folder_name);
+                                }else{
                                 move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
                         }
-                        else if ((!this.is_local_folder(folder)) && (this.is_local_folder(new_folder))) {
+                        }else if ((!this.is_local_folder(folder)) && (this.is_local_folder(new_folder))) {
                                 if(msgs_number=='selected')
                                         archive_msgs(folder,new_folder);
                                 else
                                         archive_msgs(folder,new_folder,msgs_number);
+
+                                
                                 draw_tree_local_folders();
+                                refresh();
                         }
                         else {
@@ -290 +311 @@
         
         messages_proxy.prototype.aux_interface_remove_mails = function(msgs_number,new_folder_name,border_ID,previous_msg) {
+                if(!msgs_number)
+                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
+                        
+                if(msgs_number === ""){
+                        write_msg(get_lang('No selected message.')); 
+                        return;
+                }
+                
                 Element('chk_box_select_all_messages').checked = false;
                 mail_msg = Element("tbody_box");
                 msgs_number = msgs_number.split(",");
                 var msg_to_delete;
+                this.previous = 0;
                 for (var i=0; i<msgs_number.length; i++){
                         msg_to_delete = Element(msgs_number[i]);
@@ -299 +329 @@
                                 if ( (msg_to_delete.style.backgroundColor != '') && (preferences.use_shortcuts == '1') )
                                         select_msg('null', 'down');
+                                        
+                                  if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete && currentTab.toString().indexOf("_r") > 0)
+                                for(var ii=0; ii < mail_msg.rows.length; ii++){
+                                        if(mail_msg.rows[ii] === msg_to_delete){
+                                                if(ii == 0){
+                                                        break;
+                                                }else{
+                                                        this.previous = mail_msg.rows[(ii - 1)].attributes[0];
+                                                        this.previous = parseInt(this.previous.value); 
+                                                        break;
+                                                }
+                                        }
+                                }
                                 mail_msg.removeChild(msg_to_delete);
                         }
@@ -307 +350 @@
                         write_msg(get_lang("The messages were moved to folder ") + new_folder_name);
 
+                if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete && this.previous){
+                        proxy_mensagens.get_msg(this.previous, folder, true, show_msg);
+                }else if(currentTab != 0){
                 if (border_ID != '' && border_ID != 'null'){
                                 delete_border(border_ID,'false');
+                        }else{
+                                delete_border(currentTab,'false');
+                        }
                 }
                 if(folder == get_current_folder())
                         Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - msgs_number.length;                 
-                refresh();              
-                
         }